gentoo resync : 18.11.2019

16 files changed, 235 insertions, 264 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e613dec33f82..fae1cd4733fd 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index c5efa9b6107b..53512ccbf5a7 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,4 +1,5 @@
+AUX abiword-3.0.2-extern-C-template.patch 863 BLAKE2B 3b97bbc9142c98198a9a1d86dfd18c71a37f413ff89f9af7c37b5a72e29d363ae2e5027ff3727858e14c395d157f2a2935222db9d4ebd512b264045eaaf877c8 SHA512 c030b76875d034d5be38cd2e0d86362e0eb442e3a837922c62d5e1b53c4c42b13c8fcd46ed3aac595a63410b399aca34310d31f321f3e558e889f2fb11a7bfb1
 DIST abiword-3.0.2-patchset.tar.xz 11976 BLAKE2B 72acb4956543843ad445525d1f5654c63f2544933aab35a95f0ed4f49e1385c06a29a3deb5b7ba09343188e9adf8f916f0223ab6c2a037424732f5e5bffba103 SHA512 afe6f791f167b40c2fdd16f2308add67990dd1fd0856f5a96e8f486a0af2e7b67cbcde29beacd2d869508e8f98bd3fb140240480882bcd9689cbb1fba6a75743
 DIST abiword-3.0.2.tar.gz 11154333 BLAKE2B af49570ad766b0e698313a4a88f14b2370a0a230866c4e8672f56780705060dba4207d4e13358cc290fb3c1a4a6a56efa05fed1f0540f10f7572d8e717e6cd20 SHA512 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3
-EBUILD abiword-3.0.2-r2.ebuild 5231 BLAKE2B 73dc7d2330a807e57586a00fd985556f519b11661950c7708d0d052cea7285ba7704724097f3e177ad918e35b98d645a977340875effafce7d409fc1ffc97993 SHA512 c5d9ab55a16b34474cc84edf0c2ed96e45b7aa4363ef0b42cfc9733a5f43b7c92a1cc747efb9d15aae33da4911db4f908254a84c0a9dee7163728e869d2fb1e2
+EBUILD abiword-3.0.2-r2.ebuild 5361 BLAKE2B 55641fd54f66f29c88e7eea734842aecc2ff33b74c82ecaab0ba5b51daf6103f3f69e5ba26250027d0fe414bef56328c095e389bc0513774009964d29e4b73b8 SHA512 50bc048540246bb2d24972d2bfa56776b194e4ec8691388b152e6e8910dd80bb2a3959158aba0c9b9280e57cbec04dc63871afd8be220f9aade74a51360cc5ce
 MISC metadata.xml 1107 BLAKE2B c778cccda98bbacd6f58f964748196154f517334095e7b6a0698689c758f6e2d988d8cd9e0b2909354307c4b6a51a2de8e67c3976661f78a519b4dd82de1a128 SHA512 3b11b9d4690b59fca6c4358e8292822b822ba8fc525427780597ead0550c5fec96c83d7ab4d8f1830b648f10f46dd261ed959aad63d26be814d946bd9b6907c8
diff --git a/app-office/abiword/abiword-3.0.2-r2.ebuild b/app-office/abiword/abiword-3.0.2-r2.ebuild
index 3f1d7150ae4a..654d4c6d1ff5 100644
--- a/app-office/abiword/abiword-3.0.2-r2.ebuild
+++ b/app-office/abiword/abiword-3.0.2-r2.ebuild
@@ -104,6 +104,10 @@ PATCHES=(
 
 	# https://bugzilla.abisource.com/show_bug.cgi?id=13697
 	"${WORKDIR}"/${P}-patchset/${PN}-3.0.2-bool-boolean.patch
+
+	# https://gitlab.gnome.org/World/AbiWord/issues/2
+	# https://bugs.gentoo.org/690162
+	"${FILESDIR}"/${P}-extern-C-template.patch
 )
 
 src_configure() {
diff --git a/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch b/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch
new file mode 100644
index 000000000000..08d2d6cf4e15
--- /dev/null
+++ b/app-office/abiword/files/abiword-3.0.2-extern-C-template.patch
@@ -0,0 +1,29 @@
+From b398c84c158ac96bcfc9882b42bee94b074e7fa9 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 21 Oct 2019 22:55:12 +0200
+Subject: [PATCH] Do not #include evolution-data-server with C linkage
+
+Fixes #2 https://gitlab.gnome.org/World/AbiWord/issues/2
+Fixes https://bugs.gentoo.org/690162
+---
+ src/text/ptbl/xp/pd_DocumentRDF.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/text/ptbl/xp/pd_DocumentRDF.cpp b/src/text/ptbl/xp/pd_DocumentRDF.cpp
+index 4568bd598..d5849f96b 100644
+--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp
++++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp
+@@ -1879,9 +1879,7 @@ PD_RDFContact::className() const
+ 
+ 
+ #ifdef WITH_EVOLUTION_DATA_SERVER
+-extern "C" {
+-  #include <libebook/libebook.h>
+-};
++#include <libebook/libebook.h>
+ 
+ static std::string get( EVCard* c, const char* v )
+ {
+-- 
+2.22.0
+
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index a1234633df25..7a8a5db2891c 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -5,6 +5,8 @@ AUX calligraplan-3.1.0-qca.patch 3725 BLAKE2B dfcc41d00c7c90691e6c9a8a8c25308ace
 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
diff --git a/app-office/calligraplan/calligraplan-3.2.0.ebuild b/app-office/calligraplan/calligraplan-3.2.0.ebuild
new file mode 100644
index 000000000000..512af68cc64f
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.2.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://www.calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet 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="
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${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/khtml-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=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? (
+		app-crypt/qca:2[qt5(+)]
+		>=kde-frameworks/kwallet-${KFMIN}:5
+	)
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!app-office/calligra[calligra_features_plan(-)]
+	>=dev-qt/qtsvg-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package holidays KF5Holidays)
+		$(cmake-utils_use_find_package kwallet Qca-qt5)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+	)
+	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+	ecm_src_configure
+}
diff --git a/app-office/eqe/Manifest b/app-office/eqe/Manifest
deleted file mode 100644
index a229ebfd4039..000000000000
--- a/app-office/eqe/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX eqe-1.3.0-Makefile.patch 2646 BLAKE2B 8104f09dfd06600ec12924772cf8873cc7bcd0004904a4b6da652bf8099ff656a8a8801cc42088520f15a07ed9fb886f005b8f14876666b94ff27f4930cee820 SHA512 9b9ac1ab789c54a0c3fcf51baaef112437e56b1d876cf231ecee6ee03054da4d03d53ba305239ff321484af0ab90bbf4f859a8a0fc063e3519b8363ab800963f
-DIST eqe-1.3.0.tar.bz2 98707 BLAKE2B 1cae6eba7875251dd39d86cae1e4ee93fd7e94e239173a9a70941cf1bf9dc7e2ed364d2c9708ff7beb5ff897b1e8f487a1f384d8e10e4a29dbe799e6dbe6dceb SHA512 6a1ffc1e9f4ec72ebeeb402f35857050b8f64b6fa60d9658667bad70047300c3331a1ac1ea0f0541dca9814bf55ed6e7cdd85513a24625f7cdddf3005b0a5d3d
-EBUILD eqe-1.3.0.ebuild 668 BLAKE2B 98074c9f4f8d04f4bccb4f6b08fc1a60d65d11e893fec5ce61ca78234ca30f72a498dd45c34dc24a25e35c86a09f1ba1e19b463f639eb925f2c0380d15ba1268 SHA512 af4f981ff0bc6f76429830457cb627b42f2d6960aab8486540ae940121f72a5cdbe3520c72d5d96125a8e28e936bedcfda32d916921b0934ca2fd3376681387a
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-office/eqe/eqe-1.3.0.ebuild b/app-office/eqe/eqe-1.3.0.ebuild
deleted file mode 100644
index c7eb1bc46ea9..000000000000
--- a/app-office/eqe/eqe-1.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="A small LaTeX editor that produces images, with drag and drop support"
-HOMEPAGE="http://rlehy.free.fr/"
-SRC_URI="http://rlehy.free.fr/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="dev-perl/Gtk2
-	dev-perl/File-Slurp
-	dev-perl/Template-Toolkit
-	media-gfx/imagemagick
-	virtual/latex-base"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Fix install loction and conform to the Gentoo way
-	epatch "${FILESDIR}"/${P}-Makefile.patch || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/app-office/eqe/files/eqe-1.3.0-Makefile.patch b/app-office/eqe/files/eqe-1.3.0-Makefile.patch
deleted file mode 100644
index 0b8094a65022..000000000000
--- a/app-office/eqe/files/eqe-1.3.0-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN eqe-1.3.0.old/Makefile eqe-1.3.0/Makefile
---- eqe-1.3.0.old/Makefile	2006-02-04 15:54:54.000000000 +0100
-+++ eqe-1.3.0/Makefile	2006-02-14 10:52:04.000000000 +0100
-@@ -1,7 +1,7 @@
- # Ronan Le Hy, 2005
- # eqe installer
- 
--PREFIX=/usr/local
-+PREFIX=/usr
- DESTDIR=
- PACKAGE_NAME=eqe
- VERSION=1.3.0
-@@ -21,19 +21,17 @@
- 	pod2man doc/eqedit.pod $(DESTDIR)/$(PREFIX)/share/man/man1/eqedit.1	
- 	gzip -f --best $(DESTDIR)/$(PREFIX)/share/man/man1/eqe.1
- 	gzip -f --best $(DESTDIR)/$(PREFIX)/share/man/man1/eqedit.1
--	mkdir -p $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/
--	cp changelog $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/changelog
--	gzip -f --best $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/changelog
--	cp README $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/README
--	gzip -f --best $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/README
--	cp FAQ $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/FAQ
--	gzip -f --best $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/FAQ
--	cp TODO $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/TODO
--	cp copyright $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/copyright
--	cp GPL.txt $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/GPL.txt
-+	mkdir -p $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/
-+	cp changelog $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/changelog
-+	gzip -f --best $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/changelog
-+	cp README $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/README
-+	gzip -f --best $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/README
-+	cp FAQ $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/FAQ
-+	gzip -f --best $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/FAQ
-+	cp TODO $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/TODO
-+	gzip -f --best $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/TODO
- 	chmod 644 $(DESTDIR)/$(PREFIX)/share/man/man1/eqe.1.gz $(DESTDIR)/$(PREFIX)/share/man/man1/eqedit.1.gz
--	chmod 644 $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/README.gz $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/changelog.gz $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/TODO $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/copyright
--	chmod 644 $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)/GPL.txt
-+	chmod 644 $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/README.gz $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/changelog.gz $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/TODO.gz $(DESTDIR)/$(PREFIX)/share/doc/$(PACKAGE_NAME)-$(VERSION)/FAQ.gz
- 
- install-templates:
- 	mkdir -p $(DESTDIR)/$(PREFIX)/share/eqe/
diff --git a/app-office/eqe/metadata.xml b/app-office/eqe/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/app-office/eqe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 234c35e5a597..86a840ae9efc 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,8 +1,6 @@
 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.6.tar.xz 11713976 BLAKE2B bfc4aacff79f0c92145257e7398271385f80d9ac7460b35f691c1e45dc115ebe91418a98a1a5e6a6c0cdc376beff7b92c8f7d7a29af3d2529503e7db4dc4b77a SHA512 237918b0844d5d9129d086f403090acf21be6e2ba1f41d575ff9de514a9ddcb7bd616da1377ecc34c4436e12481e425615ab640e7549c783d9010b22c0460480
 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.6-r1.ebuild 3273 BLAKE2B 6946e4f2272d9c5f7e184a3393a0d8489e0563a3c6c4fc277f7d3d76452eff805c5e978346afd0ff749e5395ce30aed40194258700a60656368b9f8b0af9fbe3 SHA512 b42fc4eb35cffd2c55f91474f76cb93987ccfc22b8306df0ce15ac79ac7f72a35d406e2d39744ae4f8a889fd8b15484fc6c9c3f7dfc2703e4588bc186c89e4e4
-EBUILD kmymoney-5.0.7.ebuild 3289 BLAKE2B 6869270fc7488729f843805324cb05c1f8355d06a1b3f037754e998d09d78dd475e3babd4dde9c7d25a792ddcebcb500088a072ee2d46c0068b4cc7674a5515d SHA512 bad389cecd8d69c00466da15070103ab11363dc9d80a4283029849cab6fb98c2befcd31f925aeca204e59088d59fa00ee077472cfd7f1483c2297c57f6c30dbb
+EBUILD kmymoney-5.0.7.ebuild 3470 BLAKE2B 2d2dd0551a5b2ef4d2b0971971f981ef38682a763da37076a7b65801dff96316da3efbed9b1f8e7a9efcdb6152ac789e7359e047bba762a3f2c4665bf880382a SHA512 90d117ced190dfd009b93d4bb00257b24ed417db43cb6f43f6b28115a0e2f709b2e5b3c24a11ebbf1819ba80db1352bdde745013fe0a6bb9dbc952b6dc687592
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.6-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.6-r1.ebuild
deleted file mode 100644
index 5d59ded0b0fa..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,126 +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-7.0.0:=
-	dev-libs/gmp:0=
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	activities? ( $(add_frameworks_dep kactivities) )
-	addressbook? (
-		|| (
-			$(add_frameworks_dep kcontacts)
-			$(add_kdeapps_dep kcontacts)
-		)
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.8.2
-		>=sys-libs/gwenhywfar-4.20.2[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 )
-"
-
-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_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(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 326c361fbcd0..d152f89f7ec3 100644
--- a/app-office/kmymoney/kmymoney-5.0.7.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.7.ebuild
@@ -5,83 +5,84 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-inherit kde5 python-single-r1
+inherit ecm kde.org python-single-r1
 
 DESCRIPTION="Personal finance manager based on KDE Frameworks"
 HOMEPAGE="https://kmymoney.org"
+
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-# 	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
+SLOT="5"
 IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
-	$(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-7.0.0:=
 	dev-libs/gmp:0=
 	dev-libs/kdiagram:5
 	dev-libs/libgpg-error
-	activities? ( $(add_frameworks_dep kactivities) )
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	addressbook? (
-		|| (
-			$(add_frameworks_dep kcontacts)
-			$(add_kdeapps_dep kcontacts)
-		)
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kidentitymanagement)
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+		kde-apps/akonadi:5
+		kde-apps/kidentitymanagement:5
 	)
 	calendar? ( dev-libs/libical:= )
 	hbci? (
 		>=net-libs/aqbanking-5.99.40_beta
 		>=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5]
 	)
-	holidays? ( $(add_frameworks_dep kholidays) )
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
 	ofx? ( dev-libs/libofx )
 	webkit? (
-		$(add_frameworks_dep kdewebkit)
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
 		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
 	)
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 	weboob? (
 		${PYTHON_DEPS}
-		$(add_qt_dep qtconcurrent)
+		>=dev-qt/qtconcurrent-${QTMIN}:5
 		www-client/weboob[${PYTHON_USEDEP}]
 	)
 "
@@ -95,7 +96,7 @@ RDEPEND="${COMMON_DEPEND}
 
 pkg_setup() {
 	use weboob && python_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -113,7 +114,7 @@ src_configure() {
 		-DENABLE_WEBOOB=$(usex weboob)
 		$(cmake-utils_use_find_package weboob PythonLibs)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_test() {
@@ -122,5 +123,5 @@ src_test() {
 		-E "(reports-chart-test|qsqlcipher-test)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }
diff --git a/app-office/taskcoach/Manifest b/app-office/taskcoach/Manifest
index cc68cb85bf41..0b89645d6486 100644
--- a/app-office/taskcoach/Manifest
+++ b/app-office/taskcoach/Manifest
@@ -1,5 +1,7 @@
 AUX taskcoach-1.4.2-fix-desktop-file.patch 825 BLAKE2B ef63d5a14e93585afe401bfadf5dea06725f5680473f66cb08b718f59db26d0bbb85b339383fc2f0168e2c4d465b4d55b974bcc3e9984017adb1bace152222b9 SHA512 f34353c8d5b6142e4d5cba973b3d2f7bb7d76f7bd3384ffa6157f3b0bf1194d9071736f8a1b20526999c86602c6343461d16be4cb0466ef2597342ebbd2645f7
 AUX taskcoach-1.4.3-version-check.patch 771 BLAKE2B c11431b1cfa0aee1911e2478cc8abd2a5d0389f22b8046851530794f3d8ebe889e335897cb986a936106399fa784532a0bf668edcbe8974d2f0d8a1caf8b0ff2 SHA512 018a9c1b678e07d1f7433e28b631917c551da4e65a5544a4cc1b1824cbb14d7c207361c6c5844c30686852d2f295fc1b6dd15095a53f371b20ac1d183e45d2cc
 DIST TaskCoach-1.4.3.tar.gz 2927984 BLAKE2B 998a53fa53624bce8497423e68924962e2cec705b87cfab192a6c5869a915f0de9d5c4394a190d07a50220258e7165b6aaee18449b9b9643a37dd9d9838a6679 SHA512 ae449ae66d29ec884de680179853d5e39814a4e7b10d8e5ca2066f1c85fda328470852a10600e74ade1e4a52c5cdc8f749eceaf4f861f8852c2f47d654e9fc88
+DIST TaskCoach-1.4.6.tar.gz 2927090 BLAKE2B 24f7b2f293d34d8ef0084c7065fdf5de6b01f437c971ad0d504125793ec71581ccedbd6db0701653db409ce04fb99b55f995037510daa58f10e2b15b439dc64b SHA512 f393f9e7d8422e1453a1bd711d08ba6bdcccd5634095262475538dfbd1fb7a943798b6ff197e38367cf8e6162e25fef50178458f73b76f483495d61545bec8fe
 EBUILD taskcoach-1.4.3-r1.ebuild 1053 BLAKE2B 752810fb3ff54f24f4a8ffe4b05ff38708ca14868b4c426d7cf6008fc52431d5166e4fb93c067becfbdf75cc65ed112a61820fc26510915ded04f9fac4128813 SHA512 aa5534c4ee8fecf098d22ffe82dab224e5c88796eeff2e99632bc7ef9d383695afc9243afc24ec6950d44cff81f9a5cd20d425205d20a7fc537783634dd435a1
-MISC metadata.xml 246 BLAKE2B e58a269f220d8dc6a6aa3ebe77996fe79dc433b43f35347eaa5ca4fb7c95bc288a6a14ed1225b1435aae118f4b2467b48dff39dd500d4c0b2867cd368a687a6e SHA512 1b06a533acb63ad6314679db7cafaacf1ee60145fc45e717b06998182c8eee6c62eb553bb6fbcb380a241f038db4bbf89e8570a5a4e6278ed73d80b948a55eb1
+EBUILD taskcoach-1.4.6.ebuild 1053 BLAKE2B e597064b1e172f8c2af9f029259b5107c277c0e72e8bf4b189fe718a660fefd0193b01e5f0138b9f65efadbf1dda50baa731ffe2f1a45ebc09749dda76455d60 SHA512 dc6dbf6be90d20018979d8722c5e39fb21c8ede0b6e9186cb2de9b23eba7e6e6d47a48eb0e8b6eb5d7999f18407affdc78a421ef050eaaf3e01ec017956b4bde
+MISC metadata.xml 742 BLAKE2B 26655a8f07586e447245578ec5405c455b0b796cb61f3f43c90f5b8bc55adffe60dad39c9636e5d5478bf2c9b94326745ffcc0d6d10c6b52b93b256fd977c832 SHA512 1e8ad0e623b769b5060bf50a7b3f9ecd0981039c7e6cc994413f16382e16e8b9515c7bf0901968ea6f17ace60dbd2f155a285f77678d5446c8560c5ac2d9d329
diff --git a/app-office/taskcoach/metadata.xml b/app-office/taskcoach/metadata.xml
index 10caf0ae4d5c..c3028aa25110 100644
--- a/app-office/taskcoach/metadata.xml
+++ b/app-office/taskcoach/metadata.xml
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bugs@chead.ca</email>
+		<name>Christopher Head</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Task Coach is an open source todo manager to manage personal tasks and
+		todo lists. It supports composite tasks, i.e. tasks within tasks. In
+		addition, Task Coach allows you to categorize your tasks, track efforts
+		against a budget per task, and much more.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">taskcoach</remote-id>
 	</upstream>
diff --git a/app-office/taskcoach/taskcoach-1.4.6.ebuild b/app-office/taskcoach/taskcoach-1.4.6.ebuild
new file mode 100644
index 000000000000..8bacc4b22d5f
--- /dev/null
+++ b/app-office/taskcoach/taskcoach-1.4.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop distutils-r1
+
+MY_PN="TaskCoach"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Simple personal tasks and todo lists manager"
+HOMEPAGE="https://www.taskcoach.org https://pypi.org/project/TaskCoach/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-3+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Task Coach can also optionally use igraph to draw task dependency graphs
+# since 1.4.4, but that is not packaged in Gentoo at this time.
+
+DEPEND="
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		>=dev-python/twisted-core-10.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${DEPEND}
+	x11-libs/libXScrnSaver
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGES.txt README.txt )
+PATCHES=( "${FILESDIR}/${PN}-1.4.3-version-check.patch" )
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doicon "icons.in/${PN}.png"
+	make_desktop_entry ${PN}.py "Task Coach" ${PN} Office
+}