gentoo resync : 23.03.2018

22 files changed, 620 insertions, 48 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 766d75c3ba7b..3dbbc2b29762 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 7b3410a70f39..e02584f263bf 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,9 +1,10 @@
 AUX calligra-3.0.0-no-arch-detection.patch 408 BLAKE2B adff8aade0b9718692e84d8ab407caa3b8b8d279609fefd3daafa0617421bb18dee4ba41374aa0eed5e41e766e7a856e7f82dbec7ac7b4985d7e133fdf4eaed9 SHA512 91e1f5a760f118c3f7abdba1409c8c119265bcf43eef405ec0fdeb7b5b4fd7c0c7e38166acebe4b1766fe276015eb12e6a62743f3d8d648c20856e25c9231557
 AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72
 AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d
+AUX calligra-3.1.0-qt-5.11.patch 6952 BLAKE2B da7beaf697f029e7ca6033aff965ac375199e5b77a574dcd97eda304ddcf2103a2f242190c7f04f01634a92986988e4b9e827d475152cdf72bf1885f5ce9970c SHA512 b6baffe13a0cd569dafe80620fa80ff2b51598573676335dcb20011ec7886f2fce31ad5200dde8e690f0921f366f81ee5e0618ca22bb00dd936863edbdb7174c
 DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
 EBUILD calligra-3.0.1.ebuild 6814 BLAKE2B 62e0cb77ebdbafc0d4dcf5e4e298122f84087dd895d9182b212ff4f040e62b04f52722860cdadf247880b9688d202985ef43b72f59841a2b79c73befb9c69924 SHA512 9fb02a5ab71bdfd24fe1588576fe1f9fbef96e4e3885e11d6a649cee6e44551c36430ae2f4c0693e9de4e5ddf5186713106a56f0b8e4df1efe61bd7711ad7adb
-EBUILD calligra-3.1.0-r2.ebuild 6721 BLAKE2B af410cfa24b444cb0c6f438f43297bbddd6daf25cb0f0897f535f41f18abff0fd8ddb49fdac594965da991d495e910029e3fb44c63eade47abf05986aa1011da SHA512 94de4d10a6a84f8c208f7cea72f6d8e7d4cbfec060ae27d179798264be62c3ccb3465e20a440798f35c04f41cab942a3360b9cb32ee6b5c645e38b2f95ef0edd
+EBUILD calligra-3.1.0-r2.ebuild 6755 BLAKE2B 4e2bb0b5d3a5273e06dc150992fcaf2de96f993c579e2b56c70230287238971b88232648d36f65cd86a2fc04e39bfd3016fe2c294d5583d9cd6a9ae312560a66 SHA512 71259df2aae3c88878d6b5a5b9a07fdbeb6f749dd8868c6229ac1724fd2700e472f26269ba336ddfce09a051cce1e189d53394238a5f37ee2257e2f25c14ebab
 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
index 4c861b1050f8..2084d5f44db1 100644
--- a/app-office/calligra/calligra-3.1.0-r2.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -141,6 +141,7 @@ RESTRICT+=" test"
 PATCHES=(
 	"${FILESDIR}"/${P}-no-arch-detection.patch
 	"${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
 )
 
 pkg_pretend() {
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
new file mode 100644
index 000000000000..09236c41de07
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch
@@ -0,0 +1,217 @@
+From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Mar 2018 11:56:57 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+Reviewers: #calligra:_3.0
+
+Tags: #calligra:_3.0
+
+Differential Revision: https://phabricator.kde.org/D11454
+---
+ libs/widgets/KoCsvImportDialog.cpp                         | 1 +
+ libs/widgets/KoPageLayoutWidget.cpp                        | 2 ++
+ plan/src/kptview.h                                         | 1 +
+ plan/src/kptviewlist.cpp                                   | 1 +
+ plan/src/libs/ui/kptaccountseditor.cpp                     | 1 +
+ plan/src/libs/ui/kptdocumentspanel.h                       | 1 +
+ plan/src/libs/ui/kptitemviewsettup.cpp                     | 2 +-
+ plan/src/libs/ui/kpttaskeditor.cpp                         | 1 +
+ plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
+ plan/src/libs/widgets/KoPageLayoutWidget.cpp               | 2 ++
+ plugins/chartshape/dialogs/TableEditorDialog.cpp           | 1 +
+ plugins/formulashape/FormulaToolWidget.cpp                 | 1 +
+ sheets/dialogs/LayoutDialog.cpp                            | 1 +
+ words/part/dialogs/KWAnchoringProperties.cpp               | 1 +
+ words/part/dialogs/KWRunAroundProperties.cpp               | 2 ++
+ 15 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
+index 0ffdcf62a70..cdca006dc62 100644
+--- a/libs/widgets/KoCsvImportDialog.cpp
++++ b/libs/widgets/KoCsvImportDialog.cpp
+@@ -21,6 +21,7 @@
+ #include "KoCsvImportDialog.h"
+ 
+ // Qt
++#include <QButtonGroup>
+ #include <QTextCodec>
+ #include <QTextStream>
+ 
+diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
+index f91555ca262..a3816f96d8a 100644
+--- a/libs/widgets/KoPageLayoutWidget.cpp
++++ b/libs/widgets/KoPageLayoutWidget.cpp
+@@ -23,6 +23,8 @@
+ 
+ #include <KoUnit.h>
+ 
++#include <QButtonGroup>
++
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
+diff --git a/plan/src/kptview.h b/plan/src/kptview.h
+index 44d11935e71..a98e55342db 100644
+--- a/plan/src/kptview.h
++++ b/plan/src/kptview.h
+@@ -28,6 +28,7 @@
+ #include "kptcontext.h"
+ #include "kptviewbase.h"
+ 
++#include <QActionGroup>
+ #include <QDockWidget>
+ #include <QMap>
+ 
+diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
+index f34e702e055..0e6db7b2ffe 100644
+--- a/plan/src/kptviewlist.cpp
++++ b/plan/src/kptviewlist.cpp
+@@ -25,6 +25,7 @@
+ #include <QStyle>
+ #include <QBrush>
+ #include <QContextMenuEvent>
++#include <QHeaderView>
+ #include <QMenu>
+ 
+ #include <kmessagebox.h>
+diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
+index 7991fafd779..54e3a87c94f 100644
+--- a/plan/src/libs/ui/kptaccountseditor.cpp
++++ b/plan/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/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
+index 00ea3af80b2..491cb1ebb86 100644
+--- a/plan/src/libs/ui/kptdocumentspanel.h
++++ b/plan/src/libs/ui/kptdocumentspanel.h
+@@ -26,6 +26,7 @@
+ 
+ #include "kptdocuments.h"
+ 
++#include <QModelIndexList>
+ #include <QWidget>
+ #include <kundo2qstack.h>
+ 
+diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
+index d1c3b1fc157..7c97a070b9a 100644
+--- a/plan/src/libs/ui/kptitemviewsettup.cpp
++++ b/plan/src/libs/ui/kptitemviewsettup.cpp
+@@ -25,9 +25,9 @@
+ 
+ #include "KoPageLayoutWidget.h"
+ 
++#include <QHeaderView>
+ #include <QPushButton>
+ 
+-
+ namespace KPlato
+ {
+ 
+diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
+index 21546118d33..91db5acbb18 100644
+--- a/plan/src/libs/ui/kpttaskeditor.cpp
++++ b/plan/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/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+index 344ebc2b599..9146f06ab8c 100644
+--- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
++++ b/plan/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/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
+index c9e17b748a9..b67e9848807 100644
+--- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
++++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
+@@ -23,6 +23,8 @@
+ 
+ #include <KoUnit.h>
+ 
++#include <QButtonGroup>
++
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
+diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+index c0d5136f09e..d2a772e83c2 100644
+--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+@@ -24,6 +24,7 @@
+ 
+ // Qt
+ #include <QAbstractItemModel>
++#include <QAction>
+ 
+ // Calligra
+ #include <KoIcon.h>
+diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
+index ed109192cc5..8f521779617 100644
+--- a/plugins/formulashape/FormulaToolWidget.cpp
++++ b/plugins/formulashape/FormulaToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <QWidgetAction>
+ #include <QTableWidget>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+ 
+ FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
+diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
+index a0a9832ddfc..7d7db53823b 100644
+--- a/sheets/dialogs/LayoutDialog.cpp
++++ b/sheets/dialogs/LayoutDialog.cpp
+@@ -36,6 +36,7 @@
+ #include <math.h>
+ 
+ #include <QIntValidator>
++#include <QButtonGroup>
+ #include <QCheckBox>
+ #include <QFrame>
+ #include <QLabel>
+diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
+index d64208cbdb6..bfddb3a03f5 100644
+--- a/words/part/dialogs/KWAnchoringProperties.cpp
++++ b/words/part/dialogs/KWAnchoringProperties.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include <kundo2command.h>
+ 
++#include <QButtonGroup>
+ #include <QComboBox>
+ 
+ const int KWAnchoringProperties::vertRels[4][20] = {
+diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
+index e38599a06d7..7e8b2d51ef9 100644
+--- a/words/part/dialogs/KWRunAroundProperties.cpp
++++ b/words/part/dialogs/KWRunAroundProperties.cpp
+@@ -28,6 +28,8 @@
+ 
+ #include <kundo2command.h>
+ 
++#include <QButtonGroup>
++
+ KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
+         : m_state(state)
+ {
+-- 
+2.16.2
+
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index f7c149930917..0a94c6a157ba 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -3,8 +3,10 @@ AUX gnucash-2.7.4-fix-tests-for-32bit-platforms.patch 1840 BLAKE2B 4de54cb147d56
 DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae SHA512 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
 DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2f934e6fc904afd4b0fb48283f9ebb89583b83b0efefba66d014df16c8997c413d05278d4290c44e4fa2278564b61 SHA512 d096ec2a3907dcd09c936f0a49ef6fb5028a17d2e0ade9e68eae7303530480ce19e08c1864efd862d363fda9ef6343260396b794b3c4ac74544baa2628a310eb
 DIST gnucash-2.7.5.tar.bz2 13330271 BLAKE2B e06328050a2dd8e80e224cf13f51c1c7151e73f9a1c9f14581f33bfcf8bf07b273962620b7281637101eab8c5eff67a3e5e8e34d81f0c8d263ac33bf6d1eb40c SHA512 68cd6e6f61a43b8837e9efe693d22f62ebe10a8bb7d593814fb6a12d035d74ec1e444f53010ad53c6b1adf28c75aa482403c06052314a91636c2a8baa30e09af
+DIST gnucash-2.7.7.tar.bz2 13368946 BLAKE2B 06e6815af713235ea31859532911303db4fa5e8dcd50b9111aa513795963eaca29a612eeced27399441f43563753d977468dfd901a49dfa689b5d36e7b985ebf SHA512 b7d91e87c4bc4e604560f4502a86deaafa4f636e9fe2af26db53b11da9f48986c970ba0ed08cb7172ca08a5fb2da451d26976963241206c388a33555c80f28fe
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b
 EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
 EBUILD gnucash-2.7.5.ebuild 3922 BLAKE2B 072fd6a6232473c97276a2a1b1988b8f3f69b6c9de963c2429150e39a444b3035e5b33fb4417bf9cea906487165bd54bcab3dd3332d429c33c411edde499cb1c SHA512 1a57b87c6c4d894e1ca4a3948916b613756e6797b1c0eafff0dea3ba380c7c28dbd53d849eae08f80522496ed710e9578ad3c48ca69a1b4f5b349abefc4a588c
+EBUILD gnucash-2.7.7.ebuild 3932 BLAKE2B 6ee11719030dd3f9c727d69d491578fcb805be530823b7e9f97869a13cc860fd6448f39d20cd9878f163977c077c7dae12934d754cf1818e37f8fb5f6f91b219 SHA512 c2b4b6067554594c2e5a7af7d495b78f7dfd74a2cefeb4c962dad2ef14f3ce2ae5a5496e4de70edbd78c5916f464a1709e6783ec0700e4f01f3e3d6605f56e5a
 MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542
diff --git a/app-office/gnucash/gnucash-2.7.7.ebuild b/app-office/gnucash/gnucash-2.7.7.ebuild
new file mode 100644
index 000000000000..11fc957fcffb
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.7.7.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# google{test,mock} version
+GV="1.8.0"
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+		 https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+# Add doc back in for 3.0 and bump app-doc/gnucash-docs
+IUSE="aqbanking chipcard debug examples gnome-keyring mysql nls ofx postgres
+	  python quotes -register2 sqlite"
+REQUIRED_USE="
+	chipcard? ( aqbanking )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libdbi version requirement for sqlite taken from bug #455134
+#
+# dev-libs/boost must always be built with nls enabled.
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libxml2-2.7.0:2
+	>=dev-scheme/guile-2.0.0:12=[regex]
+	>=sys-libs/zlib-1.1.4
+	>=x11-libs/gtk+-3.14.0:3
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxslt
+	gnome-base/dconf
+	net-libs/webkit-gtk:4=
+	aqbanking? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	mysql? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[mysql]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		>=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	~dev-cpp/gtest-${GV}
+	>=sys-devel/gettext-0.19.6
+	dev-lang/perl
+	dev-perl/XML-Parser
+	gnome-base/gnome-common
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+# Uncomment for 3.0
+# PDEPEND="doc? (
+# 	~app-doc/gnucash-docs-${PV}
+# 	gnome-extra/yelp
+# )"
+
+#PATCHES=( "${FILESDIR}"/${PN}-2.7.4-fix-tests-for-32bit-platforms.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
+		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
+
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	XDG_DATA_HOME="${T}/$(whoami)" emake check
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
+	rm "${ED%/}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+
+	if use examples ; then
+		mv "${ED%/}"/usr/share/doc/gnucash \
+		   "${ED%/}"/usr/share/doc/${PF}/examples || die
+		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
+		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
+		   *win32-bin.txt || die
+		popd > /dev/null || die
+		docompress -x /usr/share/doc/${PF}/examples/
+	else
+		rm -r "${ED%/}"/usr/share/doc/gnucash || die
+	fi
+
+	use aqbanking && dodoc doc/README.HBCI
+	use ofx && dodoc doc/README.OFX
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/kexi/Manifest b/app-office/kexi/Manifest
index 5dcd6a779445..d309adc6b160 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,3 +1,6 @@
+AUX kexi-3.1.0-qt-5.11.patch 724 BLAKE2B 8571c381220f163685017a5f6ed74cae80042e23836227e510160ffc1190e2172deb7c8280c3fadbec9b85d6f7469747e185e89414a5e2e508a4c6888442b17c SHA512 11817808ff2b0c86b52511c1f03941470beeebb61f63a6f1b5b29546de17371f9f3d771a49b2664e8c9fe07b5ffee65995d22ff19cc1aadf50af484cb2d43e17
 DIST kexi-3.0.2.tar.xz 3676556 BLAKE2B 2d1d08904c4459362d7e0d2f79bd9ae0dce2bf11c18e6a9c3a68276bbd8c2fa67075c5d0739f7ecbb853802791df8676b76b0900eda396b62d0e09cb7f3a2107 SHA512 ef1da2e4a7b9d1f80200feb111f5dcedf8e3422e797bba4ac45744cb4b2f948cf3190aa0d126d0a3bb2bfb88f8fa112919e3dbb191bfcedd03e8e4512d1cf74e
+DIST kexi-3.1.0.tar.xz 3028492 BLAKE2B 8af7105ba570af225e7e2cbea2ab15d0c6e4997414c321654691af1329930754bea8a52c3ce5abb246c6a47e17473c462b9212eab8ef30fc23e4691f2ab8c9b2 SHA512 538b8b2c021bababb59a05cd477aa4414df76f84a9ae88244afe6f3dc29751257bfee2586279ee8ee7800d939702c3a81f71562039a6f97132f2cba4e9018118
 EBUILD kexi-3.0.2.ebuild 2076 BLAKE2B cd375cffc042e1b3a2f12896b9a5b4ce3a53363ad05264e7b7fb8be7ab28b2ff38e617da4e97807f11519da7687f8dd66f1b564982b994122eea4e2cc627abdd SHA512 d24fcd511261340f6efc35c5a6179d102f905e9f61df808d80cc77e79e09fc0234c47d6b0c624b3ae349d173ff96a5885b87446fe2cf20b83a63bff2ebccfa15
-MISC metadata.xml 517 BLAKE2B 4444f9c6b70e97920fe59cbfdddae38c5a72be5e730c43ecf16ccc036b4d42d59a779366e020ce9751a38778d417dfd079517515b88cac1c6d79c6689d40741c SHA512 c7ac5eac011066fd4fed1d58c2669d844c56b5016dc6d387ac8a0b2e2eff13b1f7ddcdf92438393ead8d574a7412bf7dbd3ca62db48a18b44ba0162f83cc3d9d
+EBUILD kexi-3.1.0.ebuild 2387 BLAKE2B 718a49a42c1895f747d89a30d76f0a95dfeacaab981cd51b30cda70c7703c0bdbeb55c15a00d4ba19134def2f791365ea61b35432a2aaa1160f376f1d583424b SHA512 f1bfcc7abce347c1d855ce79740af600911a398ecd8fa5a7e7e62b84fa34213c7a5dfdd3e417fde7f3fb0897440e9d85b7d1846541143e9212159ccbb712af69
+MISC metadata.xml 600 BLAKE2B 383b28f24ff8522330ed843789c30ac771b4ecb03f45f7f60503463ead5e6a6fd4480eea83be7904d3e0cfecaca73c6fc9d8d29214fbfb2082aa97c45ba607ff SHA512 fc7615150e90fb963d4ae2775b5d0dda7667c0fd975cdcd8e5d52a87d01935471c37c9256e894c68fe88268d61d7a3cde42f36171f9160dae20ce8140eaab22f
diff --git a/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch b/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch
new file mode 100644
index 000000000000..a879b2a46045
--- /dev/null
+++ b/app-office/kexi/files/kexi-3.1.0-qt-5.11.patch
@@ -0,0 +1,24 @@
+From c7b9215e7ae30a052fa11aa4199e7adea517c7e2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 20 Mar 2018 00:06:46 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+---
+ src/main/startup/KexiNewProjectAssistant.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/main/startup/KexiNewProjectAssistant.cpp b/src/main/startup/KexiNewProjectAssistant.cpp
+index 59e819acc..6568f1b5c 100644
+--- a/src/main/startup/KexiNewProjectAssistant.cpp
++++ b/src/main/startup/KexiNewProjectAssistant.cpp
+@@ -48,6 +48,7 @@
+ #include <KIconLoader>
+ #include <KStandardGuiItem>
+ 
++#include <QAction>
+ #include <QDebug>
+ #include <QLayout>
+ #include <QCheckBox>
+-- 
+2.16.2
+
diff --git a/app-office/kexi/kexi-3.1.0.ebuild b/app-office/kexi/kexi-3.1.0.ebuild
new file mode 100644
index 000000000000..8ceeaf7b7c77
--- /dev/null
+++ b/app-office/kexi/kexi-3.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# KDE_HANDBOOK="true"
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.8.0"
+inherit kde5
+
+DESCRIPTION="Visual database applications creator"
+HOMEPAGE="https://www.kde.org/applications/office/kexi/ http://www.kexi-project.org/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="debug experimental marble mdb mysql postgres sqlite webkit"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep breeze-icons-rcc)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=dev-db/kdb-3.1.0-r1:5=[debug?,mysql?,postgres?,sqlite?]
+	>=dev-libs/kproperty-3.1.0:5=
+	>=dev-libs/kreport-3.1.0:5=[scripting]
+	marble? ( $(add_kdeapps_dep marble) )
+	mdb? (
+		dev-libs/glib:2
+		virtual/libiconv
+	)
+	mysql? ( virtual/libmysqlclient )
+	postgres? (
+		dev-db/postgresql:*
+		dev-libs/libpqxx
+	)
+	webkit? ( $(add_qt_dep qtwebkit) )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_kexi]
+	!app-office/calligra-l10n:4[calligra_features_kexi(+)]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch )
+
+src_prepare() {
+	if ! use webkit; then
+		punt_bogus_dep Qt5 WebKit
+		punt_bogus_dep Qt5 WebKitWidgets
+	fi
+
+	kde5_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
+		-DKEXI_SCRIPTING_DEBUG=$(usex debug)
+		-DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
+		-DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
+		$(cmake-utils_use_find_package marble KexiMarble)
+		$(cmake-utils_use_find_package mdb GLIB2)
+		$(cmake-utils_use_find_package mysql MySQL)
+		$(cmake-utils_use_find_package postgres PostgreSQL)
+	)
+	kde5_src_configure
+}
diff --git a/app-office/kexi/metadata.xml b/app-office/kexi/metadata.xml
index a7106e621be4..6b5e3bba39b1 100644
--- a/app-office/kexi/metadata.xml
+++ b/app-office/kexi/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
+		<flag name="experimental">Enable features deemed experimental by upstream</flag>
 		<flag name="marble">Enable displaying of maps using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="mdb">Enable support for Microsoft Access database</flag>
 		<flag name="webkit">Enable web form designer widget using <pkg>dev-qt/qtwebkit</pkg></flag>
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 5d10783bd78d..439a4cbb7ada 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,6 @@
+AUX kmymoney-5.0.1-cmake.patch 1089 BLAKE2B 5574c6bebd5502a4f6046a57c14593b5b305734981bf04fe19bc500ccb76dcc56e851213b011c4cef41795d9134e970fb5a83e7372cf928136efbbf84451ace1 SHA512 dc894facca9ff086b92397b8fde830fee54593130eb52523ba8d3c517d037f98af8639918007a4970ce1c0e1df88208dd06a80fa6cf5d00ea6a7e06269702b74
 DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783
-DIST kmymoney-5.0.0.tar.xz 13301572 BLAKE2B 6fa95f3f56feff016ea336db4f17dbaf6f6a8395b2e246e90976e36c7e5dff5d122c8a07a86c64e94c69746829aa9dfaff74c9888cfe3ba553299462175f7048 SHA512 932dcc1bbb9e767cc14b5d0689857fadee5b29fe9edabd8958c328b131c9a41f8c4bb137b7351b3fe7f10178513268391a0420b5e28881166a1d5d8bbd657ed8
+DIST kmymoney-5.0.1.tar.xz 13307860 BLAKE2B df61285f848df693510f1807bbf66b7cfec4498f2c540df3420731734a8ced8c4ae6426e338af2cecc85278120087eddc261a9e35bad50722991e3bb617d4a9c SHA512 74ace8d98f144c503d572c68cf50c27664a49bc5f4428788b69a1da52b8f72e97e1bb70914dbf041c43884c3b6340e28390618dec179ebe3d1b3ea63bede93e7
 EBUILD kmymoney-4.8.1.1-r1.ebuild 3540 BLAKE2B c414fcdb2e15c26e6c0f8c741ed4660f56ce9f353f3ec57b94a99eb52f686bb57126a9e8ffd23629322cb62f1d244558e28866cc29824573652827cfd62bd65a SHA512 9fd06bd1b03a78612d7db3b71507464ab86055693c66913f947dfa6cb14fdf79d0b380a1bd4c0b4bfea2760eda918700c2229b282af6e5648fd189087209cbfb
-EBUILD kmymoney-5.0.0-r1.ebuild 2804 BLAKE2B 1f6e82667ca0f976781d110ca71abf0c8380ab1b5d773be0336f6e0e0ac5505c2b2e348799a18ad81594db18a15f2cd74739ba8d87222e8f6e46c2f3ddd9dec0 SHA512 ed0fe2e088b1ba4e6a6843d89ca504d0405b2865ef1b783b4b54c58c32b4f0ca2fc4608f29d0e74318510f4a92f2fc8134c62d4d09c3a7a6f5b9fd3c214fdde1
+EBUILD kmymoney-5.0.1-r2.ebuild 3042 BLAKE2B c8f5636352b7c370d3b0c33a1eab1642b7616bd019c80e1bdcbffa5698286caa708a276451ecf54738c72d0ba7d829ba4daa7a325cea034391c6daed013d7069 SHA512 79a8756396dd535e6506f61deaf7857a34fca38292854dfcfef7932fbb7a14f0c534ecd3b6bb998146ad7366bdff7d858c9476798105d998797dac8719495443
 MISC metadata.xml 787 BLAKE2B 090845c035b23d5dd951c6836a154c74736597c05f52a6841596d1d3663085176aae10ae54489eb6152faa82a5c77dbe7001861c63ca1b6191a534022e1be5bc SHA512 19f3d92cb3b3e92ce1692d76af59bc474257948a4740300484f17eecca391b0a4f6f5517fe6dd06d513231706c1123cf1e955ea6fb3a321d2fbc71063da68586
diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch b/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch
new file mode 100644
index 000000000000..7ba8349b0fed
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch
@@ -0,0 +1,34 @@
+From b4053d2b41c3ff5c3e3f3cc452eef0e72202b5ad Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 19 Mar 2018 17:51:27 +0100
+Subject: [PATCH] Fix weboob option in custom configure summary
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eff5b22d..ac466943 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -317,7 +317,7 @@ nice_yesno("KMM_ADDRESSBOOK_FOUND")
+ nice_yesno("LIBOFX_FOUND")
+ nice_yesno("LIBOFX_HAVE_CLIENTUID")
+ nice_yesno("KBANKING_FOUND")
+-nice_yesno("WEBOOB_FOUND")
++nice_yesno("ENABLE_WEBOOB")
+ nice_yesno("LIBICAL_FOUND")
+ nice_yesno("ENABLE_SQLCIPHER")
+ nice_yesno("USE_QT_DESIGNER")
+@@ -340,7 +340,7 @@ OFX plugin:                              ${nice_LIBOFX_FOUND}
+ 
+ KBanking plugin:                         ${nice_KBANKING_FOUND}
+ 
+-weboob plugin:                           ${nice_WEBOOB_FOUND}
++weboob plugin:                           ${nice_ENABLE_WEBOOB}
+ 
+ iCalendar export plugin:                 ${nice_LIBICAL_FOUND}
+ 
+-- 
+2.16.2
+
diff --git a/app-office/kmymoney/kmymoney-5.0.0-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
index 46fb7493d352..eb313fe8717f 100644
--- a/app-office/kmymoney/kmymoney-5.0.0-r1.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=6
 
+PYTHON_COMPAT=( python2_7 )
+
 KDE_GCC_MINIMAL="6.4"
 KDE_HANDBOOK="optional"
 KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 VIRTUALDBUS_TEST="true"
-inherit kde5
+inherit kde5 python-single-r1
 
 DESCRIPTION="Personal finance manager based on KDE Frameworks"
 HOMEPAGE="https://kmymoney.org"
@@ -18,6 +20,8 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="activities addressbook calendar hbci holidays ofx quotes weboob"
 
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
@@ -72,8 +76,9 @@ COMMON_DEPEND="
 	) )
 	ofx? ( dev-libs/libofx )
 	weboob? (
-		$(add_frameworks_dep kross)
-		www-client/weboob
+		${PYTHON_DEPS}
+		$(add_qt_dep qtconcurrent)
+		www-client/weboob[${PYTHON_USEDEP}]
 	)
 "
 DEPEND="${COMMON_DEPEND}
@@ -85,6 +90,13 @@ RDEPEND="${COMMON_DEPEND}
 	quotes? ( dev-perl/Finance-Quote )
 "
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+pkg_setup() {
+	use weboob && python_setup
+	kde5_pkg_setup
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_QT_DESIGNER=OFF
@@ -98,7 +110,7 @@ src_configure() {
 		-DENABLE_OFXIMPORTER=$(usex ofx)
 		-DENABLE_WEBENGINE=OFF
 		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake-utils_use_find_package weboob KF5Kross)
+		$(cmake-utils_use_find_package weboob PythonLibs)
 	)
 	kde5_src_configure
 }
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index c674ad28ff81..0dd720d315d4 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,7 +1,5 @@
 DIST alkimia-7.0.1.tar.xz 38400 BLAKE2B c6dccf0702ae42bfcebfa20fc34233766ab4b08c81d7b8aa8af2be2003560f2e088e922a0ec5656c6f8e34d3f3a8348fb6315c3e5aecf72cda9fa2506e1a2161 SHA512 7f72eaf69ad38c5478498a212f6f644ab76a27aec588ff8817414c7e36190568012cd2faff7ae31978beec670539ac93e55f3637a331e90738bddc11a423138c
-DIST alkimia-7.0.tar.xz 37992 BLAKE2B 998ab4c560edf1f327369fd49e56687e35d672490fe367afbddaca5e0e8a2980213825bdeddd41e1dc37dfb825c1fc4b997e4c7c4e787ca2c819f5d0333f4688 SHA512 0d84616d6b593cba76caee4875f2cda209a4c5f3727abb9a6902faecd46dad4f4a19c099fe3c4677bf9abf540dbd5a76eacf8bb761fac3a3aee9723601064e1e
 DIST libalkimia-5.0.0.tar.xz 28400 BLAKE2B 68fa555b1e42bcadcf7aa229092e8a2d6500f4e5d03720dd259eec43daeb7f2916564500d1d2b32c0b36988a8907120404830880a7d10999c3c6b9d010903f61 SHA512 9ba205f5726f237389b9ea928ef37fc3b38161aaec5988dcc64afa3d8e53575a055b248e3c27e738db13f9e6af231f493e1374bbc50d0672729b0cdb391ce99f
 EBUILD libalkimia-5.0.0.ebuild 545 BLAKE2B 2c1264a998140dfe45f7134d43a00c99f11aaf6f8cb9715f78ffa6d5a88d0ea7f40e97b559f626e5a43c8493c14e9237e5c8350a50c624071e977b22d5ca1541 SHA512 cfbf2fa200b38a4b528421e09a3bf6da404e35cf8d5d79cbdbb81ae6f99d3bfe22a0e4bc9270417ce7dfc681ae1bc3cac0cfc05fe2c8940c7ce9f0a54132b02d
 EBUILD libalkimia-7.0.1.ebuild 718 BLAKE2B a685ac8ec2ee5b01ca49212b8aecf9f54f6a6231dba76757d52613fba640ef16c79437029554a200e10b17ead8e32e0cfd6a429f7292b682af8a53eaabe9f008 SHA512 b6c545a93418a51ce07917a63db5131a82376c2f533af100f5d0092ed6636f86aeb6450970359d25aa97b7b93f64cdd7c06828fdf8fa3d849f1438c6f7e2a3cb
-EBUILD libalkimia-7.0.ebuild 718 BLAKE2B a685ac8ec2ee5b01ca49212b8aecf9f54f6a6231dba76757d52613fba640ef16c79437029554a200e10b17ead8e32e0cfd6a429f7292b682af8a53eaabe9f008 SHA512 b6c545a93418a51ce07917a63db5131a82376c2f533af100f5d0092ed6636f86aeb6450970359d25aa97b7b93f64cdd7c06828fdf8fa3d849f1438c6f7e2a3cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-office/libalkimia/libalkimia-7.0.ebuild b/app-office/libalkimia/libalkimia-7.0.ebuild
deleted file mode 100644
index 369d414c124c..000000000000
--- a/app-office/libalkimia/libalkimia-7.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-KMNAME="alkimia"
-inherit kde5
-
-DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
-SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/7"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	$(add_qt_dep qtdbus)
-	dev-libs/gmp:0=[cxx]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package doc Doxygen)
-	)
-	kde5_src_configure
-}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 12903297b21f..a2bafa78b919 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,10 +2,11 @@ AUX scribus-1.5.3-cmake-openssl.patch 737 BLAKE2B 276d3ad6804506ef4d4c041ce1e0bb
 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
 AUX scribus-1.5.3-poppler-0.58.patch 17057 BLAKE2B 87a0e55baa398ed412b48cb5c4d3c8c2dd8f15f40da5a20f9d09a652191c77dc103640357dc5928fbfeae90031762e288221c13115da97a7d307b676f697510d SHA512 e9ad65c1c20ca6efd204829bec141336d250c073ebed08f74f07c416213bf46204826abc410510f7a72df21a00a43f7e1793847107612981dedbe96a5927956d
+AUX scribus-1.5.3-qt-5.11.patch 2165 BLAKE2B 57d76b3eda506465442a4fffcf268f1db559a341273350825d5d7e67610f5873501e16c3c1c7a27312250d4fcde920131ca2671fb349833756aa4ba372277c29 SHA512 5cbb775ab034ecf3a26a3181fdf9985418af555cfec42fc67fe314a0cf8b3ddcc01fdbded81591c7a309dc7a47611ea0126bf2d86c39fb4825d6766f0a1fff46
 AUX scribus-1.5.3-x86-fpic.patch 759 BLAKE2B 0abaed6521042c9398ea12075ffe88f3ec47b2f020a7040beb7312dfbb298e733b380935d5676102df7b04512f866bea2fb67fc9135cc741db208ad4b451176a SHA512 8b843098e31be3ad07ed82225a6b9bb7e46ae29b369508cdea6f092142d27071908c510ccbfe11b778d970e0b3a5bf14277e0124c781ba0f8bc230716a9c03e0
 AUX scribus-9999-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
-EBUILD scribus-1.5.3-r1.ebuild 7023 BLAKE2B fb1027454b96b4900ace6c0e859c15a5adb8e5e7be234a0164f7b513bca16ac7ada72fd66b93d484f57864536dec6266a6d2ab6d7c9b918d763b712300493a60 SHA512 fc814f7d0c88edb24f91326ad93f4034e0f39c1f5396c315bef6cec7b3de69c08e9867abba05f4241711d23daaee8656f74e0c77a9d60dfdec557542774821e5
+EBUILD scribus-1.5.3-r1.ebuild 7057 BLAKE2B 3fb1fa669b1742ff4426032e0c0caddcd3c7f2f3653acfe41c9cac88d46bddd85051d688d25a52f82f5f77cba0637ea64e90be89c0424d8355d9b439650f08af SHA512 0040419091f78c69532d82d86a45f0d43fd66d1a72d495382e2c30f1358404f7faa5a9e8df14344f7cfba297afd2cd78e48ee7c3f3cc846d3ac345c28ae828c5
 EBUILD scribus-9999.ebuild 6947 BLAKE2B 98d7eacf3fe442b1539519139e9a127a3d7c0ea7fa5b9e75c6b7b220353ce7635c97675df9f2df1f272116c44f6825817e8c62fff75860d4cfeb75bc4fa388f8 SHA512 fd3911b80f04485f8fc11f2b30bc3f3e1ced644217b6e1d00716e48a68154b5b12102267e363b39dcaeaff129eb46b246f415c581f724951f45b3a9e174355af
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch
new file mode 100644
index 000000000000..d46a9cfcf60a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-qt-5.11.patch
@@ -0,0 +1,59 @@
+From ed5bb7e205e10a2855b2f55d6de9d5702f81633f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 19 Mar 2018 23:52:49 +0100
+Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
+
+---
+ .../plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp   | 3 ++-
+ scribus/plugins/tools/lenseffects/lensdialog.cpp                       | 1 +
+ scribus/sclistboxpixmap.h                                              | 2 ++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
+index 3f0d916b7..645aec8d1 100644
+--- a/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
++++ b/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
+@@ -26,8 +26,9 @@ for which a new license (GPL+exception) is in place.
+ 
+ #include "meshdistortiondialog.h"
+ 
+-#include <QPainterPath>
+ #include <QGraphicsItem>
++#include <QPainterPath>
++#include <QStyleOptionGraphicsItem>
+ 
+ #include "commonstrings.h"
+ #include "fpointarray.h"
+diff --git a/scribus/plugins/tools/lenseffects/lensdialog.cpp b/scribus/plugins/tools/lenseffects/lensdialog.cpp
+index cfabc4091..bed8305dc 100644
+--- a/scribus/plugins/tools/lenseffects/lensdialog.cpp
++++ b/scribus/plugins/tools/lenseffects/lensdialog.cpp
+@@ -27,6 +27,7 @@ for which a new license (GPL+exception) is in place.
+ #include "lensdialog.h"
+ #include <cmath>
+ #include <QRadialGradient>
++#include <QStyleOptionGraphicsItem>
+ #include "iconmanager.h"
+ #include "selection.h"
+ #include "sccolorengine.h"
+diff --git a/scribus/sclistboxpixmap.h b/scribus/sclistboxpixmap.h
+index a067b7912..ebdae272c 100644
+--- a/scribus/sclistboxpixmap.h
++++ b/scribus/sclistboxpixmap.h
+@@ -9,11 +9,13 @@ for which a new license (GPL+exception) is in place.
+ 
+ #include <memory>
+ 
++#include <QAbstractItemDelegate>
+ #include <QApplication>
+ #include <QDebug>
+ #include <QPainter>
+ #include <QPixmap>
+ #include <QScopedPointer>
++#include <QStyleOptionMenuItem>
+ #include <QVariant>
+ 
+ #include "scguardedptr.h"
+-- 
+2.16.2
+
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index b65910862d8b..12d674025929 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -97,6 +97,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-cmake-openssl.patch
 	"${FILESDIR}"/${P}-poppler-0.58.patch
 	"${FILESDIR}"/${P}-x86-fpic.patch
+	"${FILESDIR}"/${P}-qt-5.11.patch
 )
 
 src_prepare() {
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index ad6493f0922d..adcf477e9d89 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -6,5 +6,5 @@ DIST texmaker-4.5.tar.bz2 11287724 BLAKE2B 9138e4765e439419384573aed210b1df30890
 DIST texmaker-5.0.tar.bz2 15728938 BLAKE2B 14d0ea9e7f8b5f4b4e40bfdbe706b585215d0df8546aeb5d614c73314f41b3f0d443ccf5d4ddb0d7eab00bf76a358cbd51e14ff21ac15e0f8e89b884f12719df SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636
 EBUILD texmaker-4.5-r2.ebuild 1740 BLAKE2B cbcb8086313b36cc4cf8f178932dda1d8d700a75d74e95303872acd59acbb5eef49f24cb81ef3033da79dbf718112986ed04cfafa61c4b0ce4cbdc4c977b10c2 SHA512 1d6025872c47fc3432e886df10c7580ba386316d9a67d022f9806001aef30ae9159a04894a5fcf557245a0f9a872daa4c930a3be6ccaa7ef8b243cb08b879c18
 EBUILD texmaker-4.5-r3.ebuild 1745 BLAKE2B bb45d7ae2a12a02ff08cc6807c4cd62a5eedcedef694244f26b25ba74245a8111f6b60918590d7a65af3ec24345664cff3969e524320763b9d00f317123caadc SHA512 7b8c330700dff8f5fe3e69ff09369983729e2ecd780e31989c8f418f6aa367c7eabcf77aaa736139203bef7f4e58e85d47c1251457d47fe57eb1925a03dfa799
-EBUILD texmaker-5.0-r1.ebuild 1735 BLAKE2B 1ee73f61a0cec82ecaf6f598fc7208d186b85e4f5d56fb03a25758734678503b3dfbbdc968b26bf00b1504be4b4a3d9022a85be897e76fa10796b1cf822da0f3 SHA512 195c3860f17107a51413fcc4e0c88f067c8e3c182eff5012c5251e8a95f3c828c44514987649e74db4f9203c9fba9c0247fd59f5b762fbba99129ab683752c04
+EBUILD texmaker-5.0-r1.ebuild 1732 BLAKE2B 2cd5841255f7d0d7f82941c1d4a71f6e32e3773370d1194a412328f01f1599204f8406127db5d2038e86e326bec87ef8d4e78a2c3167752b19d6ea92e64a83e7 SHA512 1b1d1581daa0ec5f740f122506e5dc473f71c5401220f78841e075951d50af9ca682b9b6c8ce74beee6530a68611e19192adc19a0b027c0e1f6e5cc4c99f8b50
 MISC metadata.xml 371 BLAKE2B 5e48352072e5e7318de74bfd9e5d2fbd6c746092f7a3d89ecd0f60f3c781993f1af0a37754073f5d31d480feb45992d7939ac7c230167650d4a7c859ee4b5f7d SHA512 fc327d181a4a8194af71244eb082e8e9c749b250687f038b740d1f5f62cac02f300becdbaca84b997edf8372b3352a8d840eadc2f06c8171fef339ac5537914c
diff --git a/app-office/texmaker/texmaker-5.0-r1.ebuild b/app-office/texmaker/texmaker-5.0-r1.ebuild
index f9febdd05987..f16ec154c5c3 100644
--- a/app-office/texmaker/texmaker-5.0-r1.ebuild
+++ b/app-office/texmaker/texmaker-5.0-r1.ebuild
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	app-text/poppler[qt5(+)]
+	app-text/poppler[qt5]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 3c9f9f8f36f7..1af61c08a472 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -6,5 +6,5 @@ DIST texstudio-2.12.6.tar.gz 26511069 BLAKE2B 95f2043222e15f96ed56dabb9bbbb937e3
 EBUILD texstudio-2.11.2-r1.ebuild 2078 BLAKE2B 30839bf7a4381478264178bae93d8a27b5685dd166b241254b0550b6d2388bbbf0f965937fd4a7c6123d7988d6df76a72ee450c830446c15dba9e0185772a7fe SHA512 98cf771d4aaaeec2a8ee95dc97c90978f29501e212eeafde332dcd505c2bc65475ddbc4828aa742b2d0b5a910bdf43a358f2aaddbcf8aca2f9f4271cf20e46c1
 EBUILD texstudio-2.12.2.ebuild 1970 BLAKE2B 41567a33175fe3bc434f64a861b5e9a0f15ad2a49a834f1a2c8aa1d4d73ea231557c399d04067031ef10f88dac35926561be6c7533819e3c0431db8eedae16cb SHA512 be81a9aafadd25daec6248bd09bf31cf9c9611b49d3996c79caf912e70d47a16f5430a0b37e25fee408374309130b924f1fd58e8ffcd6ea69e98d8b1175ff8ec
 EBUILD texstudio-2.12.4.ebuild 1970 BLAKE2B 41567a33175fe3bc434f64a861b5e9a0f15ad2a49a834f1a2c8aa1d4d73ea231557c399d04067031ef10f88dac35926561be6c7533819e3c0431db8eedae16cb SHA512 be81a9aafadd25daec6248bd09bf31cf9c9611b49d3996c79caf912e70d47a16f5430a0b37e25fee408374309130b924f1fd58e8ffcd6ea69e98d8b1175ff8ec
-EBUILD texstudio-2.12.6-r1.ebuild 2257 BLAKE2B 8c79671fffbfbede559c3a79ecd74cc70dc685a11647b96df25f78a0b0b9509c9169cdf218049768c84ef75483412c577adb910351eb843ffa75d08aa7165c77 SHA512 ebc851e41cd051b4fbed009c9726fcb298158091074416e2183d873fcfb03a1dc768f32f7f722876ceff61c329d3533e00b8b45305dd0cabbdcdb7f7e5b00cbd
+EBUILD texstudio-2.12.6-r1.ebuild 2254 BLAKE2B 6866dd55d3dc7ccb8f857e9290379046373179049f738616b3b563a84d2c37663eeded1531e340b8160d63b523f15db02778c31637870c5695582ec556e20a12 SHA512 76f401e2292fc082c3bcfb7d2dd0a98c964935ff1a880feed4dd22169e0305421a9328e95d6052e2c9ed26a973c1e9c120490e5246db9ed6604e34ca30c957b9
 MISC metadata.xml 402 BLAKE2B 175128174922bf7356817c3752f7207f5c6b2827c0d52e8e0d837fbd19b4429eb6d0154b729d89ff5eff2ed777fad5f05b43c52a3bd5d57ebca3d31c09439964 SHA512 f587cb59a103c39e4685815677a9cc6de4b0db189332b520aaefb3011fe1537485f184395e19f2c18a24dd7f2101e5d5dc2f3eed38f18623cb7a69ebd52da41f
diff --git a/app-office/texstudio/texstudio-2.12.6-r1.ebuild b/app-office/texstudio/texstudio-2.12.6-r1.ebuild
index e2f4d46a76fa..8e4b50e469c0 100644
--- a/app-office/texstudio/texstudio-2.12.6-r1.ebuild
+++ b/app-office/texstudio/texstudio-2.12.6-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="video"
 
 COMMON_DEPEND="
 	app-text/hunspell:=
-	app-text/poppler[qt5(+)]
+	app-text/poppler[qt5]
 	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/designer:5
 	dev-qt/qtcore:5