gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-office
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
51 files changed, 68 insertions, 1318 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index fae1cd4733fd..c742b4b24a2a 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 7a8a5db2891c..a4572e55f56f 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,12 +1,3 @@
-AUX calligraplan-3.1.0-kcalcore-19.08-1.patch 1917 BLAKE2B 83a31567dd6a36564b613eeb4f48d9e7c833fad0523ef4a86d25208a9ae7fa7636a6b3122ca56a260a23cbfc35c1ae94f17d5278dbdad9d7a217f715e21a0440 SHA512 e303aae1707230e2e57d0695bf28df141f22f70508861515e00989e747c80dc7ff8d8222150d44b2bcd2ee00242cdb29c5bc31ac322ca0501d71343c03f57783
-AUX calligraplan-3.1.0-kcalcore-19.08-2.patch 3664 BLAKE2B 1a631c4fa8e323868a291bc7356d8485171963f883540e88ca5da963d3aa0356e0edbcb4b932d9b1a3dc7f309d49e61a038db2be884feb5dcc23c9c0e30491f5 SHA512 146658f0cb82583171ff2cc700fce1ecf87ee4b4baf545904b65e4328f08ccb230004ed63a8ca952ffbfc177061bd3831b8272186f0887922aa3338c8a31f7e3
-AUX calligraplan-3.1.0-missing-header.patch 629 BLAKE2B 8b6debd0dcaf51a492be0f17a7f35d184fe26ff9ff636329858526a9f42c00ac6e66f26fc2d4a94b7ce6878dd3a4176d891b38808119d964f5dd43ff6d639213 SHA512 fdf4511240bb89df0253b2e140209583edf769993fa2ed8c27580d72a062da877d51a2dd0bc3878c386c0bb1042ce4ec50eec5675702db99377ddafcece6311d
-AUX calligraplan-3.1.0-qca.patch 3725 BLAKE2B dfcc41d00c7c90691e6c9a8a8c25308ace7819c88282ed2f4a36725b9d26ce6ae7d1bf547ec01d097971302278bee914f23039bbf66e952ed1a5fedd84423bbc SHA512 df94f3348d824de566c0a6566f076ff2a25236030353907c828a0e1cde58768c6403e2d699c419e8ef05635e6af43cb3c7cb4780568c7bf8c9e6bdcf0086463c
-AUX calligraplan-3.1.0-qt-5.11.patch 3618 BLAKE2B b1b3053e07f83eb2b07a8fde231a7deb727a34e9922246e75690e469b8b599525eb8148a5babd5771e18421bed1930bc800fddcafca6ce43d08eab1093f2d135 SHA512 3db56dfc75c667ab141259718899e7294b000ddc10084266fa9d6226da4ccde74e70673ef5603b4dbc4f92322eb0fbaaf3b0ec6bca312603f4da95463414df10
-AUX calligraplan-3.1.0-unused-deps.patch 1594 BLAKE2B 9e24816c0a69eb725e0bda2718cc629399f5fe30491f08e69a1dc9f6ab86057ce9d832f873358953c3a68ec235ac69e06e56fb076c6bc70ed8871b38c0233d82 SHA512 2f59c6c5dda49e7f579b0a623a4fc2aabbb2fa896abd4bc3ab28267d3d04e26db318da7940830563289c2deddf9ce8ad9a08fc98b528dddc67d00656c49969b1
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
-DIST calligraplan-3.2.0.tar.xz 3416652 BLAKE2B 655457ff4a8a223efff5845d7438e0a9eddaafaef76a83a2d328902c835206bafb62add6ede379e2988af1f41ebcca867ca974ca3bb470deaa9689b2f493f89a SHA512 7b9b40b90a831be64da72c7ec50f230df4f29dd9bac2c5202ee774ab1d31caf62336ce9d007a88a92da781d6a69dd1a4727957cbe557325741b659de6a9f7164
-EBUILD calligraplan-3.1.0-r1.ebuild 2583 BLAKE2B ae97f0026b07912dd74628d3f071f6233b3758e9c553d9eec00d236092fc35b1b18f7209e87ffeb6ab2edc9203a35390e06bc43daafbdddd6debed72cd9c081b SHA512 7d8624dfa0483ca08dee39c9c7691e553f5bcebc462e7152d711d9fa0da9ef8cb06bb7dbe21b3ddb61011248293b88dbf37b6553418d23a0f820291beabfd13d
-EBUILD calligraplan-3.1.0-r3.ebuild 2668 BLAKE2B dd1519967ed7c1b67fffd9ca368178c3fa1efa2d263ae735fb6bbb84def77f73882be13297e0431ed357b84faf84d566a440928fad9dc44eda9f64b4bfe82e1d SHA512 f43707eb9cd1fb67df831867dd6ec49a8d840a1fa1c682724019abee14d38c12b63c9682941131a32a993b4cfcbf4bb3d481d3672a5409c07743f4dc3c55a108
-EBUILD calligraplan-3.2.0.ebuild 2492 BLAKE2B 517a2936edbd93f42b068fbf15e1d2ae2a5ac596fe424e2f49ad9fa03b621edd18128b5514199f2029ea58915fbf413642fb52d0daae61a9bdc76298f9cdfa92 SHA512 6cc10e14011cbfa85e2423c2ab0defa4991529ab2af21e4a59ecc496ffba8f824d9ce652e49dab4ee50ab508a826929662f054b78cbb38d57622f43c32f4ad63
-MISC metadata.xml 724 BLAKE2B dd7cca931c7ffc08be44c9df711973d13fadc3deee2956b235af3653aab250977cbb491ac308da5a5502efbd359114e646ae1cb10e3f445308b90b4eeab8a6dd SHA512 367dbf0d7d0a2d03167e4e7abec2975ada6d047dd767a60967532c1fb89db09f2082ff52c1940a306dbff4feec5c8050f163d2fff6170dbe287b241d3f7c1c02
+DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9 SHA512 cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d110222256bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5
+EBUILD calligraplan-3.2.1.ebuild 2475 BLAKE2B 688ca5a860fe0e86ccc3e13669b8eec59088115486f823c6f16c8f9b97e542fe10c00498b105a0fa37d8918631f5476c85e35d4cd4abd1f67bed443b5c5dac7e SHA512 7d268eb4b2b04d7eb6ae265f36d03c746bd77fad389cac3b8f78a4518a3746a8d4911c6415ae9f33abf02054e650e5a10e6721229c7548c29fb907fe058cf138
+MISC metadata.xml 649 BLAKE2B 24dd20d4a19187e71952aad0d157b7b66adbbd8de24344e2de7aabe714cffd1db1f69f88b34aed13dfadaa62c51b3be7bc057f651d6388a0e98595688db3dc1b SHA512 44d54e0b08e4422a504a0107c73c7cbd2186698f60bc40b2c523d302150de877a86c482edb6b59ac613ef1a4ea2f04f1124ab7ab6e00c42a097a51e55a0a1dcc
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
deleted file mode 100644
index 98cc37a75950..000000000000
--- a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/"
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities +holidays kwallet pim X"
-
-# 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="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	dev-libs/kdiagram:5
-	sys-libs/zlib
-	activities? ( $(add_frameworks_dep kactivities) )
-	holidays? ( $(add_frameworks_dep kholidays) )
-	kwallet? (
-		$(add_frameworks_dep kwallet)
-		app-crypt/qca:2[qt5(+)]
-	)
-	pim? (
-		<kde-apps/kcalcore-19.04.50:5
-		$(add_kdeapps_dep kcontacts)
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!app-office/calligra[calligra_features_plan(-)]
-	!app-office/calligra-l10n:4
-	$(add_qt_dep qtsvg)
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-qca.patch
-	"${FILESDIR}"/${P}-missing-header.patch
-	"${FILESDIR}"/${P}-unused-deps.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		$(cmake-utils_use_find_package kwallet Qca-qt5)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-	)
-	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-	kde5_src_configure
-}
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
deleted file mode 100644
index 2f0f38c3d9f9..000000000000
--- a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_APPS_MINIMAL="19.08.0"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/"
-SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities +holidays kwallet pim X"
-
-# 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="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-lang/perl
-	dev-libs/kdiagram:5
-	sys-libs/zlib
-	activities? ( $(add_frameworks_dep kactivities) )
-	holidays? ( $(add_frameworks_dep kholidays) )
-	kwallet? (
-		$(add_frameworks_dep kwallet)
-		app-crypt/qca:2[qt5(+)]
-	)
-	pim? (
-		$(add_frameworks_dep kcalendarcore)
-		$(add_frameworks_dep kcontacts)
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!app-office/calligra[calligra_features_plan(-)]
-	!app-office/calligra-l10n:4
-	$(add_qt_dep qtsvg)
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-qt-5.11.patch
-	"${FILESDIR}"/${P}-qca.patch
-	"${FILESDIR}"/${P}-missing-header.patch
-	"${FILESDIR}"/${P}-unused-deps.patch
-	"${FILESDIR}"/${P}-kcalcore-19.08-{1,2}.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		$(cmake-utils_use_find_package kwallet Qca-qt5)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-	)
-	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-	kde5_src_configure
-}
diff --git a/app-office/calligraplan/calligraplan-3.2.0.ebuild b/app-office/calligraplan/calligraplan-3.2.1.ebuild
index 512af68cc64f..fa152b865999 100644
--- a/app-office/calligraplan/calligraplan-3.2.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -57,7 +57,6 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	dev-lang/perl
 	dev-libs/kdiagram:5
-	sys-libs/zlib
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	kwallet? (
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
deleted file mode 100644
index cfe8b552d9dc..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3a01affd66f8dfdcc124e23595217f3ae5a09723 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-Date: Thu, 20 Jun 2019 10:52:00 +0200
-Subject: ICal: Adapt to api changes in KCalCore
-
----
- CMakeLists.txt                                     | 37 +++++++++++-----------
- src/CMakeLists.txt                                 |  4 +++
- .../filters/icalendar/export/icalendarexport.cpp   |  5 +++
- 3 files changed, 27 insertions(+), 19 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0dabbaf..49fa642 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,6 +75,10 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-     set(HAVE_QDATETIME_KCALCORE TRUE)
- endif()
- 
-+if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.11.42)
-+    set(KCALCORE_HAVE_NO_PERSION_PTR TRUE)
-+endif()
-+
- if (PLANCHARTDEBUG)
-     add_definitions(-DPLAN_CHART_DEBUG)
- endif ()
-diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-index cd75598..ce29bfe 100644
---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
-+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-@@ -141,8 +141,13 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
-         todo->setOrganizer(node->projectNode()->leader());
-     }
-     if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
-+#if KCALCORE_HAVE_NO_PERSION_PTR
-+        KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
-+        KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email()));
-+#else
-         KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
-         KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
-+#endif
-         a->setRole(KCalCore::Attendee::NonParticipant);
-         todo->addAttendee(a);
-     }
--- 
-cgit v1.1
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch
deleted file mode 100644
index 02c67d5ada73..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Tue, 23 Jul 2019 12:26:17 +0200
-Subject: Port to KCalCore API changes
-
-The code is in #if 0, but I tested compilation of this in the calligra
-stable branch:
-https://commits.kde.org/calligra/2d484fda1b31a72659088a4bfce5c3708e923cb0
-
-So you can use KCalCore again if you want :-)
-It's turning into a KF5 framework so the API will be stable from now on.
-
-CCMAIL: danders@get2net.dk
----
- .../filters/icalendar/export/icalendarexport.cpp     | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-index b21320f..828b641 100644
---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
-+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-@@ -35,6 +35,7 @@
- #include <kcalcore/attachment.h>
- #include <kcalcore/icalformat.h>
- #include <kcalcore/memorycalendar.h>
-+#include <kcalcore_version.h>
- 
- #include <QTextCodec>
- #include <QByteArray>
-@@ -355,14 +356,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
-         todo->setOrganizer(node->projectNode()->leader());
-     }
-     if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
--#if KCALCORE_HAVE_NO_PERSION_PTR
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
-         KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
--        KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email()));
-+        KCalCore::Attendee a(p.name(), p.email());
-+        a.setRole(KCalCore::Attendee::NonParticipant);
- #else
-         KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
-         KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
--#endif
-         a->setRole(KCalCore::Attendee::NonParticipant);
-+#endif
-         todo->addAttendee(a);
-     }
-     DateTime st = node->startTime(id);
-@@ -381,13 +383,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
-             const QList<Resource*> lst = task->requestedResources();
-             foreach(const Resource *r, lst) {
-                 if (r->type() == Resource::Type_Work) {
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
-+                    todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
-+#else
-                     todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
-+#endif
-                 }
-             }
-         } else {
-             foreach(const Resource *r, s->resources()) {
-                 if (r->type() == Resource::Type_Work) {
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
-+                    todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
-+#else
-                     todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
-+#endif
-                 }
-             }
- 
-@@ -398,7 +408,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
-         todo->setPercentComplete(task->completion().percentFinished());
-     }
-     foreach(const Document *doc, node->documents().documents()) {
-+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
-+        todo->addAttachment(KCalCore::Attachment(doc->url().url()));
-+#else
-         todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url())));
-+#endif
-     }
-     if (! parent.isNull()) {
-         todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent);
--- 
-cgit v1.1
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
deleted file mode 100644
index 4ee031865a39..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 28 Jul 2019 00:07:33 +0200
-Subject: Fix compile on CI
-
-src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap<QAction*, KPlato::Schedule*>
----
- src/workpackage/view.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/workpackage/view.h b/src/workpackage/view.h
-index 6cae32b..cd2fc4e 100644
---- a/src/workpackage/view.h
-+++ b/src/workpackage/view.h
-@@ -24,6 +24,7 @@
- 
- #include <KoView.h>
- 
-+#include <QMap>
- #include <QStackedWidget>
- 
- class QPrinter;
--- 
-cgit v1.1
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
deleted file mode 100644
index 213cc9935bea..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 1 Jan 2019 19:19:19 +0100
-Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is
- optional
-
----
- CMakeLists.txt                | 18 +++++++++++++++++-
- src/libs/store/CMakeLists.txt | 15 +++++++--------
- 2 files changed, 24 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eed9d3c..3cb4b63 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
-             Parts
- #             Sonnet
-             TextWidgets
--            Wallet
-             WidgetsAddons
-             WindowSystem
-             XmlGui
-@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES
-         TYPE REQUIRED
-     )
- 
-+##
-+## Test for QCA2
-+##
-+macro_optional_find_package(Qca-qt5 2.1.0 QUIET)
-+set_package_properties(Qca-qt5 PROPERTIES
-+    DESCRIPTION "Qt Cryptographic Architecture"
-+    URL "https:/download.kde.org/stable/qca-qt5"
-+    PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support"
-+    TYPE OPTIONAL
-+)
-+
-+find_package(KF5Wallet ${REQUIRED_KF5_VERSION})
-+
-+if(Qca-qt5_FOUND AND KF5Wallet_FOUND)
-+    add_definitions( -DQCA2 )
-+endif()
-+
-     find_package(Perl REQUIRED)
-     find_package(ZLIB REQUIRED)
- 
-diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt
-index 2c96fa7..f998264 100644
---- a/src/libs/store/CMakeLists.txt
-+++ b/src/libs/store/CMakeLists.txt
-@@ -4,14 +4,8 @@ endif()
- 
- ########### libkostore ###############
- 
--if( Qca-qt5_FOUND )
--    add_definitions( -DQCA2 )
--endif()
--
- set(kostore_LIB_SRCS
-     KoDirectoryStore.cpp
--    KoEncryptedStore.cpp
--    KoEncryptionChecker.cpp
-     KoLZF.cpp
-     KoStore.cpp
-     KoStoreDevice.cpp
-@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS
-     StoreDebug.cpp
-     KoNetAccess.cpp # temporary while porting
- )
-+if( Qca-qt5_FOUND )
-+    set(kostore_LIB_SRCS ${kostore_LIB_SRCS}
-+        KoEncryptedStore.cpp
-+        KoEncryptionChecker.cpp
-+    )
-+endif()
- 
- add_library(planstore SHARED ${kostore_LIB_SRCS})
- generate_export_header(planstore BASE_NAME kostore)
-@@ -35,12 +35,11 @@ target_link_libraries(planstore
-     PRIVATE
-         Qt5::Gui
-         KF5::Archive
--        KF5::Wallet
-         KF5::KIOWidgets
-         KF5::I18n
- )
- if( Qca-qt5_FOUND )
--    target_link_libraries(planstore PRIVATE qca-qt5)
-+    target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet)
- endif()
- 
- set_target_properties(planstore PROPERTIES
-diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp
-index 1615a61..55e2c32 100644
---- a/src/libs/widgets/KoDocumentInfoDlg.cpp
-+++ b/src/libs/widgets/KoDocumentInfoDlg.cpp
-@@ -26,7 +26,9 @@
- #include "KoDocumentInfo.h"
- #include "KoDocumentBase.h"
- #include "KoGlobal.h"
-+#ifdef QCA2
- #include <KoEncryptionChecker.h>
-+#endif
- #include "KoPageWidgetItem.h"
- //#include <KoDocumentRdfBase.h>
- #include <KoIcon.h>
-@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo)
-     d->aboutUi = new Ui::KoDocumentInfoAboutWidget();
-     QWidget *infodlg = new QWidget();
-     d->aboutUi->setupUi(infodlg);
-+#ifdef QCA2
-     if (!KoEncryptionChecker::isEncryptionSupported()) {
-+#endif
-         d->aboutUi->lblEncryptedDesc->setVisible(false);
-         d->aboutUi->lblEncrypted->setVisible(false);
-         d->aboutUi->pbEncrypt->setVisible(false);
-         d->aboutUi->lblEncryptedPic->setVisible(false);
-+#ifdef QCA2
-     }
-+#endif
-     d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages());
-     d->aboutUi->cbLanguage->setCurrentIndex(-1);
- 
--- 
-2.20.1
-
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
deleted file mode 100644
index 584d14e447e7..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,124 +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
----
- src/kptview.h                                         | 1 +
- src/kptviewlist.cpp                                   | 1 +
- src/libs/ui/kptaccountseditor.cpp                     | 1 +
- src/libs/ui/kptdocumentspanel.h                       | 1 +
- src/libs/ui/kptitemviewsettup.cpp                     | 2 +-
- src/libs/ui/kpttaskeditor.cpp                         | 1 +
- src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
- src/libs/widgets/KoPageLayoutWidget.cpp               | 2 ++
- 15 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/kptview.h b/src/kptview.h
-index 44d11935e71..a98e55342db 100644
---- a/src/kptview.h
-+++ b/src/kptview.h
-@@ -28,6 +28,7 @@
- #include "kptcontext.h"
- #include "kptviewbase.h"
- 
-+#include <QActionGroup>
- #include <QDockWidget>
- #include <QMap>
- 
-diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp
-index f34e702e055..0e6db7b2ffe 100644
---- a/src/kptviewlist.cpp
-+++ b/src/kptviewlist.cpp
-@@ -25,6 +25,7 @@
- #include <QStyle>
- #include <QBrush>
- #include <QContextMenuEvent>
-+#include <QHeaderView>
- #include <QMenu>
- 
- #include <kmessagebox.h>
-diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp
-index 7991fafd779..54e3a87c94f 100644
---- a/src/libs/ui/kptaccountseditor.cpp
-+++ b/src/libs/ui/kptaccountseditor.cpp
-@@ -40,6 +40,7 @@
- #include <QContextMenuEvent>
- #include <QMenu>
- #include <QAction>
-+#include <QHeaderView>
- 
- #include <KLocalizedString>
- #include <kactioncollection.h>
-diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h
-index 00ea3af80b2..491cb1ebb86 100644
---- a/src/libs/ui/kptdocumentspanel.h
-+++ b/src/libs/ui/kptdocumentspanel.h
-@@ -26,6 +26,7 @@
- 
- #include "kptdocuments.h"
- 
-+#include <QModelIndexList>
- #include <QWidget>
- #include <kundo2qstack.h>
- 
-diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp
-index d1c3b1fc157..7c97a070b9a 100644
---- a/src/libs/ui/kptitemviewsettup.cpp
-+++ b/src/libs/ui/kptitemviewsettup.cpp
-@@ -25,9 +25,9 @@
- 
- #include "KoPageLayoutWidget.h"
- 
-+#include <QHeaderView>
- #include <QPushButton>
- 
--
- namespace KPlato
- {
- 
-diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp
-index 21546118d33..91db5acbb18 100644
---- a/src/libs/ui/kpttaskeditor.cpp
-+++ b/src/libs/ui/kpttaskeditor.cpp
-@@ -45,6 +45,7 @@
- #include <QVBoxLayout>
- #include <QDragMoveEvent>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
- 
- #include <kactionmenu.h>
-diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-index 344ebc2b599..9146f06ab8c 100644
---- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-+++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-@@ -31,6 +31,7 @@
- #include <KFile>
- 
- #include <QAction>
-+#include <QHeaderView>
- #include <QTreeView>
- #include <QStandardItemModel>
- #include <QModelIndex>
-diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..b67e9848807 100644
---- a/src/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
- 
- #include <KoUnit.h>
- 
-+#include <QButtonGroup>
-+
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private
- {
- public:
--- 
-2.16.2
-
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
deleted file mode 100644
index 707b6c8cdd5a..000000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 1 Jan 2019 20:13:57 +0100
-Subject: Drop unused dependencies
-
-Test Plan: Built fine with deps removed.
-
-Reviewers: #calligra:_3.0, danders
-
-Reviewed By: #calligra:_3.0, danders
-
-Subscribers: danders
-
-Differential Revision: https://phabricator.kde.org/D17903
----
- CMakeLists.txt | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3cb4b63..a6a3c79 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -121,7 +121,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
-             IconThemes
-             ItemViews
-             JobWidgets
--            KCMUtils
-             KIO
-             Notifications
- #             NotifyConfig
-@@ -169,22 +168,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
-         COMPONENTS
-             Core
-             Gui
--            Network
-             PrintSupport
--            Svg
-             Test
-             Widgets
-             Xml
-     )
--    find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
--        COMPONENTS
--            DBus
--            OpenGL
--    #        Quick
--    #        Sql
--    #         WebKit
--    #         WebKitWidgets
--    )
-+    find_package(Qt5DBus ${REQUIRED_QT_VERSION} QUIET)
-+
-     # 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:
-     # * Qt5 (required version >= 5.3.0)
--- 
-cgit v1.1
diff --git a/app-office/calligraplan/metadata.xml b/app-office/calligraplan/metadata.xml
index a7529db60e61..192aa1d0ef07 100644
--- a/app-office/calligraplan/metadata.xml
+++ b/app-office/calligraplan/metadata.xml
@@ -13,6 +13,5 @@
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
 		<flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag>
-		<flag name="pim">Enable support for KDE PIM resources integration</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-office/dia2code/Manifest b/app-office/dia2code/Manifest
index ef6f2d1474d9..62d78d83b307 100644
--- a/app-office/dia2code/Manifest
+++ b/app-office/dia2code/Manifest
@@ -1,3 +1,3 @@
 DIST dia2code-1.0.0.tar.gz 946967 BLAKE2B 48e6c29e9178032d17816726fe2b60c7a87518b898c22f0caec94b31d8cb10e50da4c093f178cad62f8c107bc55c3bbddef692e8608bbb73aed3afb156a2f2be SHA512 6669352e624fddc94aaaa36a30263ad591494d473ca09e662a9de90902e4b4a7a7eb6d3de9b28cf162c63ebeea36f86b33822d510ac87ce97c5f196c761bac85
-EBUILD dia2code-1.0.0.ebuild 655 BLAKE2B de3f107bee077ec2181d29b2c8c393a82a236c0fb06612b77f07f837b81f62c04667abb51a3887b5ee5e7501960fe3b66e68fb0de06f7d8b6847c43470dedd5a SHA512 a9c102c11fb1b1e0ec7f8332c861457de6639cd00cefb36b1fa687b31f9389b2cb6d46c5e96b07ad23be8d4cc3c44467e9ad6b9754c83928d3d5d94857b6ad78
+EBUILD dia2code-1.0.0.ebuild 679 BLAKE2B e5330f803b6456694de71723cde6164e53114de293b6e0b5f1edbd03937894872b2e5384ce403f8eba27de407e18feab02eb3d81166301b691226e73ac216fd1 SHA512 54449b0c01518112c01c3537c15d8ee407561e19cc6a6e46c0523e91af926682e422900da038970f1153caaa8952570bfe0bedf28f45891bf816e7a024a1fc34
 MISC metadata.xml 331 BLAKE2B 3ccf3e94cd80861d83db33fb82e6d02be76beea936164b5f132f1904eb43965278b266da1145cdb32b059919dd01f808c8353338651a8d64823de794655cbfe9 SHA512 3c08e8ed607a264bed5a4c299bb433f0b4fb930d3a3272740c300e7e0a5f8d852a7d0fa80ef7f1e7bd1dc44c1b9e85814141d8b8cc31b403a95971b8c5b27494
diff --git a/app-office/dia2code/dia2code-1.0.0.ebuild b/app-office/dia2code/dia2code-1.0.0.ebuild
index 7f505bb1e808..be9dbe3f8d5d 100644
--- a/app-office/dia2code/dia2code-1.0.0.ebuild
+++ b/app-office/dia2code/dia2code-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${DEPEND}"
 DEPEND="
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index d51da85e4e88..da109221a187 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -13,7 +13,7 @@ EBUILD gnucash-3.2-r2.ebuild 3957 BLAKE2B 370393aa80d47a51ded47b3a582385fca4ab3e
 EBUILD gnucash-3.3-r1.ebuild 4083 BLAKE2B 0c0f75dd4b3d476ea03b667b56a48a50a484cc27257208a49d7fc012ef62ea0665d2da69b4dd01e3bfa042644035548779d1eda57f5453b4a64b1b4dfffa764c SHA512 5e6fc01fc09b3cd03f0ac33a82342b5953bb0e39ceedda8e576d61f82d7f2142a4f3288bcd2b73c4520c04b95ea6e6954c6615d4c90c5179509959a50c503968
 EBUILD gnucash-3.3.ebuild 4025 BLAKE2B 94b349ed78db812b6267ac108cbc9c0ad12a5f13a1ec6816f0b2ca0eff92afd135ccd19a473fb3f12706e9597589a9069ca6095cc0d53a9fb577b8e416cd28c2 SHA512 e33005c224501bfdce4f82e809978dec9d273de55b8eaf938908c5f2feba68125c3b65805da70835dd5439fa229f13fe101fac737b9b33fd4bf1de6578963e3b
 EBUILD gnucash-3.4.ebuild 4347 BLAKE2B 746435f6184b90c177adb969ff67e4d26803258cb0970adfb30f7d240d73f40ff37664089d50aa180d0bd75124079fee9d6c13b53648514e5ee66b7b30b0de15 SHA512 1285926767b3ddb372cd5d555d93b543d40abb2bbbd874eedca0ca74930c15335b26db251a9dcbce3a274bcc57912e3c0f98f43b7877b80f3bf6e85d3ac69e4f
-EBUILD gnucash-3.5.ebuild 4223 BLAKE2B 5f4f025d1b6e2f7a39603202296b1491e54c21e14089061ac5e3034221b6d853f5ae47dd02351206aa4e17f8830d9359c01eeb86ea2e7b8c7d515c4f1029683d SHA512 4c38db2ef50b9083e2284bb61e6eee5b4e2b758f2685ae96d94406e1f48a44ffe439738d14f2f1985ed990c0097c2f7399be76c39ec5ce3ad55d4d07a6094f5b
-EBUILD gnucash-3.6.ebuild 4509 BLAKE2B cd6f6ed454a552a5d7d4c2763cc1552bd5e89fcfaa62bc5ef63443a0dbb42caab4aee4cfcefc010b4c1f668eee619341c5e7906a1765ea36f01dcbb8cc05468d SHA512 9efbc2ec69c62e85bf8f998e64d7290890bdcb2b5c1526eaaec303a30c3d5e9ec441af9edfb918466e5b9d88e4f92d203e3bd696c03f99a17e2c3c5e47f7b732
-EBUILD gnucash-3.7.ebuild 5149 BLAKE2B 7b6de008d03dd6ab29219077586eb868ff8ca8e300fafa33904ff07a60b4c3d3acbd43b151abd7793a63906029858f26d828c83bdb338b46ffaa1a2beef0f602 SHA512 a1adbffa7dca5be588158dbdb3a90926b68c3891a63d7a7680323afdb962c390248c2f41dfc2dc6cac94bb0c5b3f70533ab6450eccfcd1bd48cabb612ce9fa52
+EBUILD gnucash-3.5.ebuild 4221 BLAKE2B a2261c0c56bd09be2226d3bd8b4f6c7d644ab162e26b59bf19618d7cb72b44b387475922293fc7b64da001d743f6704e6d1859435a3d2d75708cf35ecb505097 SHA512 dbbe2d888e4c7ffccaf26814bb9e0b2eef812461badc9374726fbd6062be91e589dc7d56005140737626ea930e840f92af2ba17e6a7eb5de3bb523d53964418e
+EBUILD gnucash-3.6.ebuild 4536 BLAKE2B 3f321a49ca209fc6b1dcedac7556832c7c9ce956a5371e31198e48d05cf7f5492a49a1fefe17b298e013a66f7eccc18412ad2440fb5a31a6922a6273728555e9 SHA512 72374d050061ca662aa6e645b574cd4b703219d10335aad0637b45187e59b609cb4bc3efa5022d1e576ff0663c1b814fc5ebe49f88e78c2b67fd5f6020ec0203
+EBUILD gnucash-3.7.ebuild 5176 BLAKE2B 767736ad86b3a2ebe06ba43ad048cda3f3497123e4cff9cfda6edd4575200ddb3323eb5bb02a6501a6abcc31bee292e93925b13acc80127a030409a6cac3cc7a SHA512 4d5babeec7461bda83578b2b827b447198e1e9691a19ac7a28d2919ca2ac4d9612939a360450bafda83099d7ddd51362e423c31e30b503970c4a8315f7b8658d
 MISC metadata.xml 763 BLAKE2B 7ee35e5a74d4ab310b2108f1c918c10346c91c0518f79741731b9161d4fea53118bd7ede78cf8fabf9e6ad923c7ebed5eb29ad2ab88e9e257f71a186bf2622ba SHA512 cb7805a7f24d2207270f430672d806eb1afcdac5b969d7a534a35e49390042fe854a8838e2e0a2e51c4399292103102917a5b585cf687fecba73c398acdd8c15
diff --git a/app-office/gnucash/gnucash-3.5.ebuild b/app-office/gnucash/gnucash-3.5.ebuild
index e7521d2945db..97eb65a78f2e 100644
--- a/app-office/gnucash/gnucash-3.5.ebuild
+++ b/app-office/gnucash/gnucash-3.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx
 	  postgres python quotes -register2 sqlite"
diff --git a/app-office/gnucash/gnucash-3.6.ebuild b/app-office/gnucash/gnucash-3.6.ebuild
index ec42d91eaae7..14c67d5d77f7 100644
--- a/app-office/gnucash/gnucash-3.6.ebuild
+++ b/app-office/gnucash/gnucash-3.6.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx
 	  postgres python quotes -register2 sqlite test"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	chipcard? ( aqbanking )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/gnucash/gnucash-3.7.ebuild b/app-office/gnucash/gnucash-3.7.ebuild
index a78ec12c8fc2..6700f7ef1872 100644
--- a/app-office/gnucash/gnucash-3.7.ebuild
+++ b/app-office/gnucash/gnucash-3.7.ebuild
@@ -18,6 +18,7 @@ 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 )"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	smartcard? ( aqbanking )"
diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 0cfd6ef8ff3d..bb6c8676c592 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -2,4 +2,4 @@ AUX gtg-0.3.1-desktop.patch 334 BLAKE2B 639f2eb22b67def21485d2837ef9ed03860dd659
 AUX gtg-0.3.1-locales.patch 584 BLAKE2B a6a7e8797a0e082e77545101455ebf70b40bc72f706471f85c4ba9b0a0d5293c61bd6afdd56d478b554eca882bf309db73a5e8f9c02f9eec912022fdf710a569 SHA512 4a62d55e0bdf4cb0bfaa3edcbf7f1573645c2d5505ec98c17529437545bd5f18374a561063d5e5d163bea0064d9daa9f82a29ee2f8ebeb00833c678d47446142
 DIST gtg-0.3.1.tar.gz 7902244 BLAKE2B 843c0df194450e9fcc718f94b83973209184ab041f42751ff1a32275c839b5e0bc80fe7aa903d91ce44d5999b496cd50218d8656c060d70fcdd3f3561f4eacb0 SHA512 7d342971cd98fbe5b84ec2f2b4c918dd668d00699b6f0afb76b143acdbe79807525bcc02d2e189769c24de5a8b33d7eef4ce242e3c091fe09505daac55158f12
 EBUILD gtg-0.3.1.ebuild 1929 BLAKE2B 6cf7deef0b847b541cc38e20a38f60f083d7bb73213e02f2a9a5f0db4cc06cdb690f9e654a07c7e4d806d15fb490ed420026a013bba301844dc2a6ae1dc598ee SHA512 d8191011dc938d8f2f01193ebdd18411f3635772b9d08252a7da8046072c2b8e6c971be400c1f9877c9e66bd86fb261361b5e808f2aa74495ba071ded341de45
-MISC metadata.xml 961 BLAKE2B 2f4308fd2c31cb88a84a87c7e0000d18e47fab4dda0f68d9ca034366d198b7dde3b25f3c3512afac95f795da3766c2da2d8540320af692d56e601b381be56b32 SHA512 373c7e0baeaa24aa7416be88b2526b7de7912bbcf10acea35e80e649f93a8d6a0f2ea3f2df45cb0d466fb6e9893e66aa6690ffb58cd39603fd2d26146bfff4ef
+MISC metadata.xml 886 BLAKE2B 5f0068ca29003ca7dc9988c6e648076eb612103a30c0d5bbf60faec65c7e859d8546243d42764f2b09c000c37ad05e665646aefc6493288c856e2ee96f3187ff SHA512 9676a4693ee4c934eb22673f80b13fe61531e6c82b821990d070ad7c3b709a416c14741c870c3845e5d49a1b4c91b7c8fd16b7812d5e7466ebf352f53328f945
diff --git a/app-office/gtg/metadata.xml b/app-office/gtg/metadata.xml
index 7d791919d833..52d8a782ce45 100644
--- a/app-office/gtg/metadata.xml
+++ b/app-office/gtg/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>eva@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>leio@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 86a840ae9efc..2cca98674ce1 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,6 +1,3 @@
-AUX kmymoney-5.0.5-missing-header.patch 755 BLAKE2B 156557b8e264bf56b5a5c8e2d05e4fc3646d660776ceef66089af19c24e8a6f866e398a97d71073b80e4305e7ba8450a76ac492f180155010f62f0e1e0370b32 SHA512 02d589e7b2c90495835cc020f42377c93a1a478ea00a7a7a59b407a097d96306664536fc99fa4bfea359b8accb47ae0c08f63d28feca0c6fa0bbfd44addb7893
-DIST kmymoney-5.0.5.tar.xz 11706112 BLAKE2B 7c0e51ad2404a88affd7b99c8ca59b813b646a7d995b5d7f6db311c8813f2966d14b34271f3d9de73d07c763fb191e9f4c0737e64feb35a62cd719856c20bab1 SHA512 ba8033b974b93d47cd2a732a352025715845d3dff016a49babb6b724d5e9b726f84f5e2a1f1f42765a6ff35a00d3d995397f2831981d48cb8468d1407030584c
 DIST kmymoney-5.0.7.tar.xz 11667088 BLAKE2B 4d523bb9ea5d41dc6aa6e52b0b982384c6e6ad3cf6981e961f137320a36fc395136b81dfd3b8c8085375c46dc9affaa5b746f9250cce72a6c8ad6af669e5109c SHA512 af0663bc7ac3fe59a8c7db09942bbb8a182ea5f7ee3bdc05e7ed449c7172040de2282997db95fcce823f7d3d8f6f2b43229b5e4ba3b349eb8ea3b2756636f6ed
-EBUILD kmymoney-5.0.5.ebuild 3278 BLAKE2B 91e564fbfa0323bee326b1adad12c1c903161feb65707d3d001d6679f9eb51a1d21757578bcbffc247de0682a20d3b9d7706f8ac3567e4d8eb2947cb7dc7ee92 SHA512 755df5db3e7d4623498df44c9d0acf5ba4edea706d7d1e087d3ebf4422d011c254d9f711401323ba162c316ea557c1c45d21df189abcc3934fa26085e0adf56a
-EBUILD kmymoney-5.0.7.ebuild 3470 BLAKE2B 2d2dd0551a5b2ef4d2b0971971f981ef38682a763da37076a7b65801dff96316da3efbed9b1f8e7a9efcdb6152ac789e7359e047bba762a3f2c4665bf880382a SHA512 90d117ced190dfd009b93d4bb00257b24ed417db43cb6f43f6b28115a0e2f709b2e5b3c24a11ebbf1819ba80db1352bdde745013fe0a6bb9dbc952b6dc687592
+EBUILD kmymoney-5.0.7.ebuild 3468 BLAKE2B f47070ffe3242ab6e0566cd3c0429fb245b63d2598f8e447ce21cea25c864e2e743c520076d8c6e4e5886bede59fa5dfa643c13426bd5d5b1f7e9afddfc89338 SHA512 db4f2fd4331216f118cdcebfa0cbbbf8734a6a2cdc439efea098816f7ee0ae39e5083e5c27ffe67fe6625e29cf3ee334a4cb4b116bc37ca9a3fb942566006ca3
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/files/kmymoney-5.0.5-missing-header.patch b/app-office/kmymoney/files/kmymoney-5.0.5-missing-header.patch
deleted file mode 100644
index d365607aecf2..000000000000
--- a/app-office/kmymoney/files/kmymoney-5.0.5-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b48fc8588f1fd98b116fce21ebfda6416f558146 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:10:44 +0200
-Subject: Fix build with Qt 5.13
-
-Yet another case of QMap no longer being included.
----
- kmymoney/plugins/kmymoneyplugin.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kmymoney/plugins/kmymoneyplugin.h b/kmymoney/plugins/kmymoneyplugin.h
-index abd6b64..ccff5d3 100644
---- a/kmymoney/plugins/kmymoneyplugin.h
-+++ b/kmymoney/plugins/kmymoneyplugin.h
-@@ -25,6 +25,7 @@
- // ----------------------------------------------------------------------------
- // QT Includes
- 
-+#include <QMap>
- #include <QObject>
- 
- // ----------------------------------------------------------------------------
--- 
-cgit v1.1
diff --git a/app-office/kmymoney/kmymoney-5.0.5.ebuild b/app-office/kmymoney/kmymoney-5.0.5.ebuild
deleted file mode 100644
index 44508ca3d7dc..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde5 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"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-6.0.0
-	dev-libs/gmp:0=
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	activities? ( $(add_frameworks_dep kactivities) )
-	addressbook? (
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kcontacts)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.6.5
-		>=sys-libs/gwenhywfar-4.15.3-r1[qt5]
-	)
-	holidays? ( $(add_frameworks_dep kholidays) )
-	ofx? ( dev-libs/libofx )
-	webkit? (
-		$(add_frameworks_dep kdewebkit)
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	)
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	weboob? (
-		${PYTHON_DEPS}
-		$(add_qt_dep qtconcurrent)
-		www-client/weboob[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
-
-pkg_setup() {
-	use weboob && python_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package addressbook KF5Akonadi)
-		$(cmake-utils_use_find_package addressbook KF5Contacts)
-		$(cmake-utils_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_KBANKING=$(usex hbci)
-		-DENABLE_LIBICAL=$(usex calendar)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
-		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake-utils_use_find_package weboob PythonLibs)
-	)
-	kde5_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	kde5_src_test
-}
diff --git a/app-office/kmymoney/kmymoney-5.0.7.ebuild b/app-office/kmymoney/kmymoney-5.0.7.ebuild
index d152f89f7ec3..dcb9282ee91c 100644
--- a/app-office/kmymoney/kmymoney-5.0.7.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.7.ebuild
@@ -18,7 +18,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/kraft/Manifest b/app-office/kraft/Manifest
index d87113c28a90..f0d8432afc8a 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,3 +1,3 @@
 DIST kraft-0.82.tar.gz 668251 BLAKE2B 82ef37b695d0e7a2c72e0525c4aa9b9742d6c8d73c95e3ef5517c49c01869a5f1ba0fed1f18200f2a39ada5a92bcca5cabfac901f07c0a968783506d298ff164 SHA512 7a342bf94e2fe0de42004a69a29ce07a32dd70eb0f16b1dc18c889b7f0a0290142d5c0bc26b40a321753b0a0e62f6b91ecc8fbed98d32913881996a2507070e8
-EBUILD kraft-0.82-r1.ebuild 1139 BLAKE2B f2b348c3befc3767b11c70cd48b7bcdcf3507ef360cc73a7c09ac13a4deb5564b5e2240c7aec4a99bb356e9f2ff2bcc64543c34adc9c91a8d0c13c6965692644 SHA512 6a244c7827ea17d0a3ebd3bc92239112124cc5000b8d1985be502b23f54f2db54500437af46820ef1af2b7f3d1d235b8351c91c7d16164c37d01f2ac60c2d9ec
+EBUILD kraft-0.82-r1.ebuild 1257 BLAKE2B 92751cc77dd72fedefeeeb76d55a2c0e3d360b296f5603935c3afb584886f23600e988b429b013c23959c92789df68f81ab9341a3ffae6abd210ed3677dedb63 SHA512 f688c10afaf930e4804b0e3a5f4aa0c2842db22ffd6383c96fe1dd72874a75e018a3a6a3e6dc0df0aa6073a16a0d4f7515835477affd74296d9d5b52dc7883df
 MISC metadata.xml 418 BLAKE2B b99b3d436a90af1cd1a791e8cd1aeaed2c654a659a45f5e88b5c5b0cd02d57bc15df8e225cd93e9041732dfbf45792721d29df8c2187d409ecf3a4202855266e SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232
diff --git a/app-office/kraft/kraft-0.82-r1.ebuild b/app-office/kraft/kraft-0.82-r1.ebuild
index a22c6ff153f0..6d97b4c1e767 100644
--- a/app-office/kraft/kraft-0.82-r1.ebuild
+++ b/app-office/kraft/kraft-0.82-r1.ebuild
@@ -3,35 +3,39 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm
 
 DESCRIPTION="Software to manage quotes and invoices in small enterprises"
 HOMEPAGE="http://www.volle-kraft-voraus.de/"
 SRC_URI="https://github.com/dragotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="pim"
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
+	dev-cpp/ctemplate
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	|| (
-		$(add_frameworks_dep kcontacts)
-		$(add_kdeapps_dep kcontacts)
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+		>=kde-apps/kcontacts-19.04.3:5
 	)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-cpp/ctemplate
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	pim? (
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep akonadi-contacts)
+		>=kde-apps/akonadi-19.04.3:5
+		>=kde-apps/akonadi-contacts-19.04.3:5
 	)
 "
 RDEPEND="${DEPEND}
@@ -42,9 +46,9 @@ DOCS=( AUTHORS Changes.txt README.md Releasenotes.txt TODO )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package pim KF5Akonadi)
-		$(cmake-utils_use_find_package pim KF5AkonadiContact)
+		$(cmake_use_find_package pim KF5Akonadi)
+		$(cmake_use_find_package pim KF5AkonadiContact)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/app-office/libreoffice-voikko/Manifest b/app-office/libreoffice-voikko/Manifest
index bd841d5a04a3..862abeb47711 100644
--- a/app-office/libreoffice-voikko/Manifest
+++ b/app-office/libreoffice-voikko/Manifest
@@ -1,3 +1,3 @@
 DIST libreoffice-voikko-5.0.tar.gz 51882 BLAKE2B c4d33f469821b3d3ee15f71c21a2e3fd5474939dda204873e85d9e52aee0d1cd9c01f660d63fdbef87786dbb0b8a88ba4fd45b8aff07b0b35588c9933d4c9cef SHA512 58f139c190acf5c56a8506365c296d06efd95b4422bb66c50e8058231bd10410b202d2a01ad0a2bf82dc0f41565c1e3a07ed86a4ae070d32af8cfd0e56d7eec0
-EBUILD libreoffice-voikko-5.0.ebuild 1414 BLAKE2B 09aafaa560e94a1f8ab9e91829fb28307ab6ae4fa6d7a0026f5878e55ff37223fc93cffe63661c66db3ebcff27b67f7f74f8b08009a093236397c4b1735a64d9 SHA512 054ff39abf9507e70c645f32880a2741613795cfeaaaafed7c833ddccd871986099b28f19ea000e5c3f5d965427b9453bdf9c63a9a1d50ca5bef063a2200e0f1
+EBUILD libreoffice-voikko-5.0.ebuild 1412 BLAKE2B 60021c1523537d4057345e8d7a5fac6ba6cdb21c2b0b66108d6ca357d0a1f34b881f6df222e8d1aec8e216c92505f5eee8cae6705b7e040141408b1a1744b0c2 SHA512 b52639e6e1e8a9e9290dd64a3b01b27478cfe2678718a253aba3461e9320058bfd8b5ba4a3e7aff6fd275484b9fb110f1ce1d20d3ca801f5db43a254d6656b40
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild b/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
index 407d34087ed9..7d9eece935c9 100644
--- a/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
+++ b/app-office/libreoffice-voikko/libreoffice-voikko-5.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-office/libreoffice[odk]
 	dev-libs/voikko-fi"
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ae8dc5d96a5d..fd7d074b1aee 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -14,8 +14,8 @@ DIST libreoffice-6.3.3.2.tar.xz 224944844 BLAKE2B 16d58d1b34f6a7da5a9cb32dade8f1
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.2.8.2.tar.xz 13024032 BLAKE2B 524ba3ff77670afeddddbf8be4724b5e54f9b157582cfcac8640e2184b8ae24c8e5e01b924415949f1756c18e2d54b8eab7efb78c979321e50b6d52b741ddd49 SHA512 c1f5b1b3c50da0a47a9724c9fc3544a15b7df72e66c5c2008afeae7732e2b29f0e57e64ce9a216c3237acdb4345715525f32be290f3196ba6e28685fa6c0925c
 DIST libreoffice-help-6.3.3.2.tar.xz 13192080 BLAKE2B 108f33d77ec24ac5f5b669aae72dc23f0ae1800038d9028a3c92b6dfbe09003cb6d9f89a6675162c8cb058ac850a0e7c5544f8692c527cfa83bd32ba28149a50 SHA512 c4d994c4047aeee5e35207228e2b62ccc7d7303ae8fcbfb52cbf73950f232ad8d45953ee364379d3834e79c59ab79df920ec624ebe4b7214f955c2bd89af7cee
-EBUILD libreoffice-6.2.8.2.ebuild 15950 BLAKE2B 5ccf935dddc916af4f0edd7f3d0d9cf1625061ac9d40732bc6e7448986db37b72c03c9bfb57c5c37fad0eb1d6ce839bc203f07596b1e0987cc9500fa74a899b9 SHA512 cd7098ffffc5c06d924ea132968ab495b2b124e95171ae96c31b10fae01c38b6d36b8d5b911f38c8b6052b8a6d537067661a00c8437bae6edf6c06153f2f6e26
-EBUILD libreoffice-6.3.3.2.ebuild 15980 BLAKE2B 761dd6e50808db0eb34582281a6a40365e8021bb4d5137e8a76ecbfb4735655a465a322cc70a0b2bf2566598c3df2d3a2aecaf0e5faeb4301b64e2a6b393acb6 SHA512 e0dfa11d5134178e8951f3ca9d323e997178180bbf9cf52d83ec634a37399af3a0ba7dcf4c70cb99ee4c3fcdd3cc520efae261477a384684495b9ab2247d0644
-EBUILD libreoffice-6.3.9999.ebuild 15942 BLAKE2B 822d251c7b2a37c6a1658ec83d5f2a5b97242b9b7dd86e6e646f2ca0b6e4c33f96ea0d49aa1e55a825ef5c3ceda553ac18ac0d1654b025b0f026816ceaf984e3 SHA512 328d05f143ab2c0dbeb1dccc38571d0f60477d6eeafadadcf16c1bb43d7a41d389b83bd6b450b6212c179698125718afd44789d608222c81e8ddbc7651317a3f
-EBUILD libreoffice-9999.ebuild 15764 BLAKE2B a7796af30d5dfa59da00a579eb514090ee66c28746af04f1662cb1376368b7b4b2ef7fb4b2e3c4ebfafcaaeea96e64680e9a6c144990d1559615afcc294f23d2 SHA512 f2cc4860b46f45870451c053b4b5c6bb6f4ff37e84b10bc7f04dcfeaa8f27543f70785aafe99f8b917d2ad39b7ae0a8ff1a55040d9d2bef3274939bdc611dc30
+EBUILD libreoffice-6.2.8.2.ebuild 15977 BLAKE2B adf91d1dd189fa8a0c27cfe6169b4e18527ec2c0ce6f15b7b92c510912b808a51b4c88a655671e1710a72aef652af3f57019e67d6ab63e07d1869ffba654f002 SHA512 0ee4c81c54379d00a664e1ce5a0615f06fd20a09f5c60c0e8ae57ee362b7649151bc1aee01b26bb9e186e1734cbc4ed412f4c306cfd00365e4e71d084fea632c
+EBUILD libreoffice-6.3.3.2.ebuild 16007 BLAKE2B 0e3d1e7c9be957a8be0e8f5c221adc8fa1be25209f7f26195b183aa7a97c2ced55c5bd416374e10fb9121eb9f869e9d91c6622844e49e0aa13eef80f5680621b SHA512 abde3c81efb0c9c633d6fa0a33b239c7de5280576664463a87497b9da292f26437fed2c1607cd957f21c24c45d2ebe9adff761b735a316b7d01c3077a13d43d1
+EBUILD libreoffice-6.3.9999.ebuild 15969 BLAKE2B a00cbb3aefa3dab6a5dd41b6ce4d1a429a2e07750a3a65f3972b5ad4c6e88287bc89ab8028b381f953579e6b11ae081138932399e7ee505a3e2c7619297d9997 SHA512 05a1a32fd87ccf112f717a3b492848dfc12110e51c293350144941165f1d340708b5f7b57a9c6fcc7ebf03b550a8df8d2346f95eaf14d31703023033d9797111
+EBUILD libreoffice-9999.ebuild 15791 BLAKE2B 8dfedfab0b459ed927cb1fbf51e13050115a0baf65a44a8a731338d2e83e5c328faa18f28e89e56e543ee99bb424e496753a306c88bd6485d7d0f12924e9b2d4 SHA512 f88e030e80318f6143e6b69fecf3953921a026ce374b88b37296bdbe10e011add8fe77a548f43dd3fe4235e1931cb5cbd3d88c561da912a4fb537585f73407e1
 MISC metadata.xml 1007 BLAKE2B 9cfefc8eb71dad67a632810e4b3b91e17534565b245bfd71f2b34819fb96edef9617be5a899778e4ca5f54c7963d43f0a23615c003bd175c41c6f59d245e449c SHA512 5d470c6d1099a5c932e5a7418a72df7999df949c3ca2911efe7a18a900cd7580b00c540eae91478894f86368d7c9840a5a22cd1b2971382d06274caa3c572223
diff --git a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
index 35ceeee6bfbf..4ad56b304bb4 100644
--- a/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.8.2.ebuild
@@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
 googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
 	libreoffice_extensions_nlpsolver? ( java )
diff --git a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
index c7fc98d14c9f..bfcd63258985 100644
--- a/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.3.2.ebuild
@@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
 googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
 	libreoffice_extensions_nlpsolver? ( java )
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index 9834ebf899b8..7a8ee9560f67 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
 googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
 	libreoffice_extensions_nlpsolver? ( java )
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7b8edda7c8f9..52c11f8e8ca0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -66,6 +66,7 @@ IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
 googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test
 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
 	libreoffice_extensions_nlpsolver? ( java )
diff --git a/app-office/moneydance/Manifest b/app-office/moneydance/Manifest
index 642ca20c428a..3a3a9580df42 100644
--- a/app-office/moneydance/Manifest
+++ b/app-office/moneydance/Manifest
@@ -4,4 +4,4 @@ DIST moneydance-2017.10-x86.tar.gz 134860964 BLAKE2B 92181a6c6a81063377823b0fd9e
 DIST moneydance-2019.3.1880-amd64.tar.gz 134414524 BLAKE2B fa6991b245efb76d9af17611ce5f24c4c77fe171417f41ccdccccbfa0b6795fbcb1c56c072dc7382e85f81ec57302040eb0cb091162964026fd230e6b5b3eecd SHA512 1e0cedb759168123de357cf4f69691ac4bd9868524d012f924d00c8f653a3505d3defe8c79e0c151d2b9163dfa40b551b0cc86fd7da678e841902bab812a1d2c
 EBUILD moneydance-2017.10.ebuild 1503 BLAKE2B 26cde10e7460a69484a3449f288e0a2f55925a55a7e8144650e563a00ed8395c9c95680034878af75195e858389bf30954bc7cfc679ada7a10f2f7081d61412e SHA512 207e71aa55a9f194c5f23d04c6626687c34d5717a80c64a30590623e5396912fd26e874bad4f29b63627800806ab8a3af0685be4854d9cfa27536c270427a268
 EBUILD moneydance-2019.3.1880.ebuild 1368 BLAKE2B 46bf27fe15c0e9f5a4e1094ae28ad3ff1a613c7b781163b85afab7c81e3145e9659fe0e59c32f2fef12af9415488d63d0e7424c87bceb89bcee67c88f2770238 SHA512 d693047132cc62d4cb9710dd2d92dde3eff331b46b6aaf14b34d792ab3449ee00045205d542824c5e324d7b284587093f9ef01cd211aeec2d7de0155abcb7b46
-MISC metadata.xml 601 BLAKE2B da75b9789bf828531d9a23f3143bf6977af23efdefd4c2d9cf1488c7d3a66a304f202b1cd496fc807cdf52d271f7a50bf3090e1d7d60d427656ab2bdec4f9ce1 SHA512 a77ece9db983b7955d26e760f6d1951cafaafac57c217cd916070a3d477daaea93338a26ff523d87e4ca4227e1ce02d122f5939069caf8c7bbbb3d0fda9d8e6d
+MISC metadata.xml 482 BLAKE2B 1ecfa1f0e8d8f5d67c8b60ddbcae821ac1ea776e984a3db7c0480e7e16872ef29c562bfd2963252ebc9f23b208ae70a1d9391fd5ae592074a2d4bcbbde637b78 SHA512 5b4c0c6b163ddce368d7f64e64550f988fd0b302024a50e4f07b5f13826e9fc7407109d4b04129fb01d62cd1f1d69de3d4814ce0e0fb1b744455ac2e2bf725d2
diff --git a/app-office/moneydance/metadata.xml b/app-office/moneydance/metadata.xml
index 2c7b5849ff8c..41761fd08398 100644
--- a/app-office/moneydance/metadata.xml
+++ b/app-office/moneydance/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Moneydance is easy to use personal finance software that is loaded
 		with all the features you need: online banking and bill payment,
diff --git a/app-office/ooextras/Manifest b/app-office/ooextras/Manifest
deleted file mode 100644
index 0088023cda61..000000000000
--- a/app-office/ooextras/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ooextras20060909.tgz 19152149 BLAKE2B fb189427e636969289db7e10c9225734ea26d41bbac0b376e2d1501caa7b7d9243722d8c4001b3dcb56c9d5aa8e1bebfe8389d1b9f4c24c93e4bb2d23fee30dd SHA512 5e58a11ddf3e82e19f606ad734777eed8beb987fbc7765f9c0154f6a9a0c288f56da47a2bc4b5f091927ee9ccb41a668c7cb518c528af7642ab95ca73dc5b81f
-EBUILD ooextras-20060909.ebuild 716 BLAKE2B e3af6706fd723ad2a1389dfc365541bd5f12465e2806eb025ba218051ee523d781812b78510013a6baa7196e61209b70bdb6a070e2e2a2baacc6eca3596c3455 SHA512 fe32188ee5273d62c4049ffe130b16f3ffbc203b792d5589aa934875115ffdc689a3056e8a65eac81c806cdafb793483f4f109727aeace111bdfcbf6a7885a49
-MISC metadata.xml 562 BLAKE2B 3d8f2966ce288cf17e50668518fbaf7d2f67901c68a7159884407e7bdadf1fbf00ee28b4758f582becb1818e8a7dbdd7d92ffa1bef64c7ced867e9d09e8deda4 SHA512 be8f9c9cb7b0d9a75e97dced24904f44de6a7ff1302fa31b2d5b91e3eb0406579e92029e12223495ec0761dd56ca52045bfc7d5af02a3b02317a47caba2c6e04
diff --git a/app-office/ooextras/metadata.xml b/app-office/ooextras/metadata.xml
deleted file mode 100644
index 2ddd7c9530a9..000000000000
--- a/app-office/ooextras/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>office@gentoo.org</email>
-		<name>Gentoo Office project</name>
-	</maintainer>
-	<longdescription>OOExtras is a set of community generated templates and sample files. For it to do anything useful, you also have to install one of the different flavours of OpenOffice.org that Gentoo provides</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ooextras</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-office/ooextras/ooextras-20060909.ebuild b/app-office/ooextras/ooextras-20060909.ebuild
deleted file mode 100644
index 4ce0c8a7f825..000000000000
--- a/app-office/ooextras/ooextras-20060909.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="OOExtras: Extra Templates for OpenOffice.org!"
-HOMEPAGE="http://ooextras.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ooextras/${PN}${PV}.tgz"
-
-INSTDIR="/opt/${PN}"
-S="${WORKDIR}/downloads"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 -sparc x86"
-IUSE=""
-RDEPEND="virtual/ooo"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	true # nothing to do
-}
-
-src_install() {
-	dodir ${INSTDIR}
-	cp -R -- "${S}"/. "${D}"/${INSTDIR}/
-}
-
-pkg_postinst() {
-	elog "Please add ${INSTDIR} to your template paths in OpenOffice.org"
-	elog "You can do this under:"
-	elog "Tools > Options > OpenOffice.org > Paths"
-}
diff --git a/app-office/projectlibre-bin/Manifest b/app-office/projectlibre-bin/Manifest
index d9f12020cb98..6b86c981abe1 100644
--- a/app-office/projectlibre-bin/Manifest
+++ b/app-office/projectlibre-bin/Manifest
@@ -1,5 +1,5 @@
 AUX projectlibre.desktop 252 BLAKE2B f534e42ec22ec4e6865977689ef6645adff9d092f055e8526ebef164f11d8e342cccd5f5c58fbe8e25af39ede9a226d3640946140167875cdfe9abc6abe8ca1a SHA512 529f368924efdbd2fe330982fcb4db010ee5985d9e7beaa0bbf0490a85e3ed477cb7de4d33d1705ff01f32cd477d7eb8adf84ab82e5065865c6b341614a4833a
 DIST projectlibre-1.6.2.tar.gz 14735171 BLAKE2B 1e69b3be153eb936879e930cf942faf0061b07b57e43db74f2f8d9380bbff969d764cbf70b29d5d38edb011331337258681888a5289b8fb04a997c0e38f1b651 SHA512 128319a37aeeb4603fd45433e3961805b0de30e5760394d5eef2de1910bff3815e600462aa3264fa64df55eb8568849895c9d673e5574badafcbc1df89e2c9e7
 DIST projectlibre.png 7955 BLAKE2B c8d35e249b8961d7a5d1a6b20844b30cc8a564c69a85791a036a05779352b24d1cc3956c6c7b83941152e06ece0ef1e0a1ff74231e47bd1efae7d1e20dc83764 SHA512 db6e87e74fac3274be34b36cd9daf7231f06e19096cfbe2feeb616c1ae1a60ffc838a81b45b94621d806e00ef5e220391f1d1be3148f9895aa467fdbcac62843
-EBUILD projectlibre-bin-1.6.2.ebuild 1035 BLAKE2B ad4aa40352e5b5e5f752a276bba75b58fcac66d9872c16ce774c68d4c402d3f71bb24e531c4e3bcf52fee80c2cd4988393ff63bfff24736a93e292676a0e00f6 SHA512 8ab0df92cabcfd54bf908d6149ad8f614fd9ebabf366a4cfc66cb973eb028c56b552469a8334ada67b481e5c26b849be313cb2d6c5c874cd215ef2a45de20c47
-MISC metadata.xml 330 BLAKE2B fe83f36967e79911e5de3d4d6cd200c04ffd40be1b8d6db80ec5c5b34697c3640e1d893defccc793274c97c69ed21b9d7ab73380eaef1a71e5f3dd2f0da80ab5 SHA512 545f629e7476e52c5ab1cd3fd321f287ab4819969efc7c9b90287be197d9cad2a598b5ebfcd36e66041341351ca0f9cfde29e53b3262e72ac0c3cf1d18c1f586
+EBUILD projectlibre-bin-1.6.2.ebuild 1021 BLAKE2B 03da3f3643797c91defb08ea42ab342b356f62a19ccdbf4709f08760b07efb892a88ff51a0ed098afa65a52cd90a5cb2ca6009fd79caa0cab6d180e19ef0330e SHA512 8fe568f4fa4001468a83e5da9cac8984252295b93a89c94381bc9fe1bb1f83fc6ae09f7fc8de5906b23a91bbcea1588899af9f54d6a4d53de3b590cbe350f14d
+MISC metadata.xml 249 BLAKE2B a92e8f0d53aac2a1a3e907d47da8a2d745c6832c829f7bc248d82821c7ba39093c1207b19c6c86ae8f66591274790b8d4a01ef1d439a0ed57bd4e4c18dac70d4 SHA512 65f6cf55d429bcce486e2299b126e80f93de5cb94fc687ff8922766d042ec6bbdcd336682f474b7be26c0026bd0afe3be78fae657d047a184c8354bdc5dff591
diff --git a/app-office/projectlibre-bin/metadata.xml b/app-office/projectlibre-bin/metadata.xml
index 5ae0c0c4e56f..b3f70e985d15 100644
--- a/app-office/projectlibre-bin/metadata.xml
+++ b/app-office/projectlibre-bin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>creffett@gentoo.org</email>
-		<name>Chris Reffett</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">projectlibre</remote-id>
 	</upstream>
diff --git a/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
index 4631aa88b465..6100648a8483 100644
--- a/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
+++ b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild
@@ -40,11 +40,11 @@ src_prepare() {
 src_install() {
 	local d="/opt/${MY_PN}"
 	insinto ${d}
-	doins -r * || die
+	doins -r *
 	fperms a+rx ${d}/${MY_PN}.sh
 
 	dodir /opt/bin
-	dosym ../${MY_PN}/${MY_PN}.sh /opt/bin/${MY_PN} || die
+	dosym ../${MY_PN}/${MY_PN}.sh /opt/bin/${MY_PN}
 
 	newmenu ../${MY_PN}.desktop ${MY_PN}.desktop || die
 	newicon ../${MY_PN}.png ${MY_PN}.png || die
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 45f84974b451..e49adefe411e 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -4,12 +4,9 @@ AUX scribus-1.5.5-docdir.patch 1053 BLAKE2B 3efadd63156463cd0d955b8de072082a3d95
 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_pre20190429-poppler-0.76.patch 2102 BLAKE2B 80cc47f73cd3c2d8fe5a5ff379b37c279d65fccc68864e28f0cfcbeaf4953eb548e8ccc87d2754a3d2b7014e5702bfb8a191a57e634e77abba55d59b9c6c3bd9 SHA512 210243d3a2f104cf0e03ba0a8df7db15818fcae5808f3974a1260079d31e83b363b29c85aced985cc29b889ea07359a0ac5e62fb03c3ecc0f2b4bc98d633a5e3
 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_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324
-EBUILD scribus-1.5.5.ebuild 4259 BLAKE2B a2adc7f37a14b3102f10326125348e41daf31c401bdbad4aa02bf107a88d6e657be9b4288ed307d700a4315fb37c0d75935203d4876bb16e9deaee4aa8b84dbc SHA512 e7f6f40f35b2dc2ce7124a6a4e59f241c024dffaaaa08356abcaefc782b6a55a3c817f72651960f3dac4f8a4b5531c9a271048704d2924135935834805a56a72
-EBUILD scribus-1.5.5_pre20190429.ebuild 6836 BLAKE2B ecabcfc6b6d7291bfd7820030464106185ba921fdd02ea3b2d483a1d4754817ab2f479dd319e23b85f0355f7e4e1a246e7740344896157f9b3bf558420bc0755 SHA512 ee4ac07e72a4de97f45f2b90af8568f79e3669aed79332ba42aead90db6c38209756f38cf251ed4dbbe90020bc4a6eb9dafaa9277514829713dc74d702ef41ad
+EBUILD scribus-1.5.5.ebuild 4257 BLAKE2B d956d36daccea56fa73920e5834cae3ab3d095d6a531f06c6c4c15f3a95061b4a21b4e57f19a2e7888bfbd7210ca1864a24d42d8a6633773812b46db2599b443 SHA512 6fe53454da47b274ee83761eec9da8f0bce314a453f0858cf55bef72cfecb9cb947f9deeee26c975d37526ac7e242771559f4e4d2214b35a768dc718db671ef7
 EBUILD scribus-9999.ebuild 4249 BLAKE2B 9df9a3210b3229837f87c730d6c096b1a8623bba5e26b7f2acacdcb8ead5012f58b340e111f5c82039d4bcb2c210af273d6a96ef34083f50de3fa7b7a390fe80 SHA512 3a5267ffbb917cbb13633e92f8b2f949288ab7925fd50de647ec5fbc7dbdcd0274724d87aedc26633bb278014efca0f01890fcf675055f1c35cfe38284090220
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch b/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
deleted file mode 100644
index d62db93663ef..000000000000
--- a/app-office/scribus/files/scribus-1.5.5_pre20190429-poppler-0.76.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From aeea6a2ed4cb15ce8c35bb83066ef03e4e04b29b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 2 May 2019 00:08:12 +0200
-Subject: [PATCH] Fix build with poppler-0.76
-
-findPage(int num, int gen) -> findPage(const Ref ref)
-
-https://gitlab.freedesktop.org/poppler/poppler/commit/244c7d6926463b079b1f96e34d9e4451d352942e
----
- scribus/plugins/import/pdf/slaoutput.cpp | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index fe9794a65..b25082de6 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -429,8 +429,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- 			{
- 				if (dst->isPageRef())
- 				{
--					Ref dstr = dst->getPageRef();
--					pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+					pagNum = pdfDoc->findPage(dst->getPageRef());
- 				}
- 				else
- 					pagNum = dst->getPageNum();
-@@ -451,8 +450,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
- 					{
- 						if (dstn->isPageRef())
- 						{
--							Ref dstr = dstn->getPageRef();
--							pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+							pagNum = pdfDoc->findPage(dstn->getPageRef());
- 						}
- 						else
- 							pagNum = dstn->getPageNum();
-@@ -931,8 +929,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 				{
- 					if (dst->isPageRef())
- 					{
--						Ref dstr = dst->getPageRef();
--						pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+						pagNum = pdfDoc->findPage(dst->getPageRef());
- 					}
- 					else
- 						pagNum = dst->getPageNum();
-@@ -955,8 +952,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
- 						{
- 							if (dstn->isPageRef())
- 							{
--								Ref dstr = dstn->getPageRef();
--								pagNum = pdfDoc->findPage(dstr.num, dstr.gen);
-+								pagNum = pdfDoc->findPage(dstn->getPageRef());
- 							}
- 							else
- 								pagNum = dstn->getPageNum();
--- 
-2.21.0
-
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index 65a2d33765b6..c00d61006ab4 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa 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/scribus/scribus-1.5.5_pre20190429.ebuild b/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
deleted file mode 100644
index 1926b62bb623..000000000000
--- a/app-office/scribus/scribus-1.5.5_pre20190429.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-CMAKE_MAKEFILE_GENERATOR=ninja
-COMMIT=a6cf8dce47922ebe3fca131316236e3aa7ca2d9b
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="https://www.scribus.net/"
-SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
-
-#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-# osg
-# couple of third_party libs bundled
-COMMON_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]
-	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.62:= )
-	hunspell? ( app-text/hunspell:= )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	osg? ( dev-games/openscenegraph:= )
-	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.3-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-)
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-src_prepare() {
-	rm -r codegen/cheetah || 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
-
-	has_version ">=app-text/poppler-0.76.0" && PATCHES+=( "${FILESDIR}"/${P}-poppler-0.76.patch )
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# bug #550818
-	append-cppflags -DHAVE_MEMRCHR
-
-	local _lang lang langs
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if use l10n_${lang}; then
-			# From the CMakeLists.txt
-			# "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
-			langs+=";${_lang}"
-		else
-			# Don't install localized documentation
-			sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
-			safe_delete \
-				./resources/dicts/README_${_lang}.txt \
-				./resources/dicts/README_hyph_${_lang}.txt \
-				./resources/dicts/hyph_${_lang}.dic \
-				./resources/loremipsum/${_lang}.xml
-		fi
-		sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
-		safe_delete \
-			./resources/dicts/README_en_EN.txt \
-			./resources/dicts/README_hyph_en_EN.txt \
-			./resources/dicts/hyph_en_EN.dic \
-			./resources/loremipsum/en_EN.xml
-	done
-
-	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}/"
-		-DWANT_GUI_LANG="${langs#;};en"
-		-DWITH_PODOFO="$(usex pdf)"
-		-DWITH_BOOST="$(usex boost)"
-		-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
-		-DWANT_NOOSG="$(usex !osg)"
-		-DWANT_DEBUG="$(usex debug)"
-		-DWANT_HEADERINSTALL="$(usex !minimal)"
-		-DWANT_HUNSPELL="$(usex hunspell)"
-		-DWANT_NOEXAMPLES="$(usex !examples)"
-		-DWANT_NOTEMPLATES="$(usex !templates)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local lang _lang
-	# en_EN can be deleted always
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if ! use l10n_${lang}; then
-			safe_delete "${ED%/}"/usr/share/man/${_lang}
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
-	elif ! use tk; then
-		rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
-	fi
-
-	use scripts && \
-		python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
-		python_optimize "${ED%/}"/usr/share/scribus/scripts
-
-	mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
-	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; 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
-}
-
-safe_delete () {
-	local x
-	for x in ${@}; do
-		if [[ -d "${x}" ]]; then
-			ebegin "Deleting ${x} recursively"
-			rm -r "${x}" || die
-			eend $?
-		elif [[ -f "${x}" ]]; then
-			ebegin "Deleting ${x}"
-			rm "${x}" || die
-			eend $?
-		fi
-	done
-}
diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
index 6d6d1db71891..21d04d193cf8 100644
--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@@ -1,6 +1,6 @@
 AUX timeout.patch 460 BLAKE2B 66cb2918b2ad85cb987ecae492626a0ca06344cac4e9fab1f6a141bcb7822356936439e2239ac586aed8a163e297a5b563e51d382e372c2435256933a4ca3612 SHA512 00ccee1c2040149432565abf4cc0bc8966801202a88c75f246d4b4c986dd43288f30045d4e966c973efa946532eec1f07a6bdff0b9307bd9c12475c9309f3fa5
 DIST unoconv-0.8.2.tar.gz 104072 BLAKE2B 1ac16159f939a06cc75f3ff23f5aa7f1c4d49a41d4cce5e9c5866714ef1b3b969f94c074d36fff19d6af22375d5598033fb69761a09d3e60b81d794841c0e0d8 SHA512 cd6a4d06559895c0aebb5fda51ca86928474dd0ca0aa908e81762643186c29cf8436c889eedbb18bc74ed6016414d1aa831cd034614244d5aae677a6b4cdd4c9
 DIST unoconv-0.9.tar.gz 108547 BLAKE2B 6620a7adb32c25182fbb5d0b141ec15d461ee7a73d8644e92337fd7748607d0d33a5978add4c72abf2b35f769f8bbfa35d411f77c4750606e22d6cbc7d7b3454 SHA512 1d6448154ec41776ed4d2ffd87b1caa15e231676a1161072676b1f5a466ea6dbae904de3eafb9ab2718fe4ed0ab7a2c9a91b1d19d79ea382c1e7576ea21e7f04
-EBUILD unoconv-0.8.2.ebuild 815 BLAKE2B e0d502ad629f97922abde433879164f35da2a4fbfd5e9668f24841f80cc706bdd1e04b7a8f916fd13e4375e1344c8d3513043818b29bc8ce2ff04bfa6a6ee941 SHA512 a80a29022b5dd421720ac9100889e6d1959727bad1c09f19fafa81bd85122bab482873aaafd2153a20df700e50a87b995e87ea62d729da252e37333e1293ef82
-EBUILD unoconv-0.9.ebuild 817 BLAKE2B 9a18f0009809b5b04490b8bf4f1f963293825c7d34c169d73158a4beaec8baab1f7e5075a334bf56aa44c34bf0afd849f69cc52290f9d43c2814a52ff26b74cd SHA512 bee8efd4743d2fbaa83370a5a107820c0be40d6192e773e7d918dc42bb5ae21d14da18f34a8af3e74c6936952a496abf2b8328eb402e2525414408b8696c75e0
+EBUILD unoconv-0.8.2.ebuild 801 BLAKE2B 43b1244cbab0c4c401317d0345efeb972b15de886723667a0946febef7256efdd7ec710b1f380eafb19ca2cdff6c6d12f6021090a487100bdd9fee62664c07ec SHA512 b3f5eb06daf6ecadb5266fea27bba7aa92ab75fe3120e544b7344d1c6bd04c00634fb241904ecd59f066bf04653f1c6365b15d2aebd9aa4b843d061296d47064
+EBUILD unoconv-0.9.ebuild 803 BLAKE2B 4df34fd861ca141ddc570ef75b88776c6633c81c761787ff50fdf821455197dbf1d6cf7dc554877a1d9b70eaa535ddc235050670c978d0a5bed87abf837252a8 SHA512 7f39424a987d71f347db901af12134d80a1db2f8dc2b5379f943f2743d8fc794d01b3cb67ae581c16db6fd914a55e04ea46e2c0b25bb44186d5620820405526d
 MISC metadata.xml 429 BLAKE2B c863daa05c0d7d265b60a04e0b1336067296b3854c83aa2c08891bbfe0d3fd45971312b6385b50c7ccb47676b65e97afee953a675176643c4bde348a6a3f0162 SHA512 3875bd4f015c8ffc902a3aedf042cd46cbe86f4ef6dfd1a493d3d7c171bf12248763e64d1f448800fa571157d3e5adac0aa191c9ad40667762ed17eadf3840ed
diff --git a/app-office/unoconv/unoconv-0.8.2.ebuild b/app-office/unoconv/unoconv-0.8.2.ebuild
index 02da637f2ae8..578d57995ee4 100644
--- a/app-office/unoconv/unoconv-0.8.2.ebuild
+++ b/app-office/unoconv/unoconv-0.8.2.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 src_compile() { :; }
 
 src_install() {
-	emake -j1 doc-install install install-links DESTDIR="${D}" || die
+	emake -j1 doc-install install install-links DESTDIR="${D}"
 
-	dodoc ChangeLog CHANGELOG.md README.adoc || die
+	dodoc ChangeLog CHANGELOG.md README.adoc
 }
diff --git a/app-office/unoconv/unoconv-0.9.ebuild b/app-office/unoconv/unoconv-0.9.ebuild
index 1b1189bb0d81..c4555c5eadd4 100644
--- a/app-office/unoconv/unoconv-0.9.ebuild
+++ b/app-office/unoconv/unoconv-0.9.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 src_compile() { :; }
 
 src_install() {
-	emake -j1 doc-install install install-links DESTDIR="${D}" || die
+	emake -j1 doc-install install install-links DESTDIR="${D}"
 
-	dodoc ChangeLog CHANGELOG.md README.adoc || die
+	dodoc ChangeLog CHANGELOG.md README.adoc
 }
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index a355722d51af..c3aa8ef78155 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,6 +1,3 @@
-DIST wps-office_11.1.0.8372_amd64.deb 213018066 BLAKE2B 9769bc6c4c6d292259594f0e39361e67e00cfb4bae05119ecf12ce0666944110c5bc61f5761cf8713bb944237780883116b928a6623d8e6ec476667c64f9c8af SHA512 9a690f6ec9b46f827dcf593316f71bcb13ad55568ccb0056c679e5c803a899cad89b7399d307da07a239aeca7a08a5669b8892649f005464fe0cb2efa926d523
-DIST wps-office_11.1.0.8372_i386.deb 216082588 BLAKE2B c8d4f2f4e12b28a38553023ba281add34266266ffadbf1c0bfc3c6a08ef5b0c9f1b3ec828cc5106aea3c8d28409b87a9fc0a3c791f4e9f95e1a2a63ff2651c50 SHA512 76044bbb0cba614a2c506baef8e309f9a965009aa74922a64975a7a78f703e7091efedfb363ff0d86bf794b854cd6646226db902bf8a9afc064a64631cbb05e7
 DIST wps-office_11.1.0.8865_amd64.deb 252991358 BLAKE2B 476d7431a7690b56a2958233bd204a75a32b7f6f7598a092ede89355db6e9749194de41d1a0598e4ef02c96190a5803db007fc848540a5a1e797a32c8f918c20 SHA512 2f515fdfd3f380eb5ba2661006288b04d192ff75d02b95ae2f16a146b287aa78b24d2ae258590354fa567c2c52502ef4e7b9f2ad6ea965911208557681c4a1e7
-EBUILD wps-office-11.1.0.8372-r1.ebuild 1927 BLAKE2B e4f3111f103e6a8f7326da8a7fd23b41b85b71aeccf32dbe3551028a417c09c3cfa3df623e4c907de45ff025e93ac4f09954631eab78d77a1adcfdab99f56868 SHA512 a07826ae3b27bd84a7b4dba98f7e669bb27b4b736efd497ab7d006f0a6e490a6ebeb6d4414ab31895877a123895423b5478efdfab21da83fa58accee271bb6d0
-EBUILD wps-office-11.1.0.8865-r1.ebuild 1819 BLAKE2B cd8993666633350c99df97b78651b9f04172e5120dd274e428c354d7f29b156ba63d5a909beedf11e836fc89df846dd5e37af5feb5a3e2841f5fcb7acc950183 SHA512 84d37b01f65788122b53513ac2145261af910c0b7121f9e58667df701cbef7f002dc8b8ea1bb123695881ba93298b6b38f01f9c2bd100dd6cb6bdfd5ba87c71a
+EBUILD wps-office-11.1.0.8865-r1.ebuild 1835 BLAKE2B f1bd17458a814b4d324397b71b17cfeae8ae536862249d13bff65bc333315d2d46bf692bb02ee0c63b853041a6762d852dd948fb2b3bc97961254301245d26e0 SHA512 ade3439fcde452a850347b182ab7595efc7753d29fc938e18b43a9d36b69c7a26c849e6a67ed1e2c44d45e6d8b0c26e0e2425346230ca67fc92af29cb5598b11
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild
deleted file mode 100644
index 9bd4cf23a68e..000000000000
--- a/app-office/wps-office/wps-office-11.1.0.8372-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 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="http://www.wps.cn/product/wpslinux/ http://wps-community.org/"
-
-KEYWORDS="~amd64 ~x86"
-
-SRC_URI="
-	amd64? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_amd64.deb )
-	x86? ( http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_i386.deb )
-"
-
-SLOT="0"
-RESTRICT="strip mirror" # mirror as explained at bug #547372
-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="
-	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
-	dev-libs/expat
-	sys-apps/util-linux
-	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/libgcrypt:0
-	app-arch/xz-utils
-	app-arch/lz4
-	sys-libs/libcap
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-libs/libgpg-error
-	sys-apps/attr
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/wps
-	doexe "${S}"/usr/bin/wpp
-	doexe "${S}"/usr/bin/et
-
-	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/{wps,wpp,et}
-}
diff --git a/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
index 490d154afda2..fdde184764a3 100644
--- a/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.8865-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.wps.cn/product/wpslinux/ http://wps-community.org/"
 
 KEYWORDS="~amd64"
 
-SRC_URI="http://kdl.cc.ksosoft.com/wps-community/download/${MY_PV}/${PN}_${PV}_amd64.deb"
+SRC_URI="http://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}_amd64.deb"
 
 SLOT="0"
 RESTRICT="strip mirror" # mirror as explained at bug #547372
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-office
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)