gentoo resync : 18.08.2019

4 files changed, 29 insertions, 103 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 49dd16d313be..f31efa9a306b 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,4 @@
-DIST skrooge-2.19.1.tar.xz 21111836 BLAKE2B 5a1a7a8212699ce657e33f5b2ab12b305a3c6840dccaeff20fc42796b3587d02a60cd1f2313909b6411e9ad71c4f1bd254349d9a9846c6707a31736507713fef SHA512 4c9addaf56bda0a575c995a2d9229927f6c23ca1931d8ea50ec83afab31149006fd0cc339af79afe0d046c00b5d3dbe4c629e48eac404a31fbe45b3747dcb869
+AUX skrooge-2.20.0-missing-header.patch 870 BLAKE2B 8aafc1b0fbc8ddb4f94c1bbfdbf077ae0b2da6ea52e314e51461e503c3e99a5183c5d4e6569bfd76d7639f76b2aad5448944cb5bb33a6afd2fd2c7163eb27776 SHA512 81f6e9b0938430de6c71c708cd0072fac3cf5236f8adea2f6451bbb6676abff854e2f4d751fd09c95f9fc05657d56733a0e30f7423664a1341d981fbb731c87a
 DIST skrooge-2.20.0.tar.xz 21787404 BLAKE2B b289bbec8d6e369298a142360cc07c6d522d44969c55c68de70df4a9ad574e2a07e9b349091bb8b902408afc709552692557363ef9e7ca2a4375abc41236cd3f SHA512 5b4a9b5b17e24e222a99024bfed03d126df117d4b0af5b5828248ecb08df72dc595225290f811c9a5d45b552f465d361f19f95c4c1ef492bb39db38aa68fa96c
-EBUILD skrooge-2.19.1.ebuild 2486 BLAKE2B 49fb355d5c5d80145991189cf7861dce26ce103a497bc3e060ec8dbfeefe78abca478b5e3115c4309202e89462ce419bfa8728f47022ba9897d334707a91d30a SHA512 5441630ebcaa1e8474848863586ac2b9913787efae2f7d252abecb425b7528825c699805fe73eda0099cf55e1538a95ab3d258d2ee6e94eaebcae15033d4579e
-EBUILD skrooge-2.20.0.ebuild 2488 BLAKE2B db76b74b36fb4e610bcb8e69b1c36d63ef098f902ff71d70ae9df1531d72df3364f48676b4485d425bc07a74bf83d6b97bfaa0c9575b162cd55216655f2971dd SHA512 9e1408fee5d2f3748509da3a7d81dab5ed3f182ba6807aec40f68b87cdd5dbdf1becd6bda948ca0573eea1cef31072ae91d9eceac6ac6f37ea778d8863504a9a
+EBUILD skrooge-2.20.0.ebuild 2539 BLAKE2B 3781fd1f606c89c29129275914949facc0205c79dfcb5cbd1b7599a69109864290d3a4e456989e5e9f172f8b0a7b2aa168c1fb25a6173aed01ab10c6840d2015 SHA512 eaa45c5bef18ecfdc685980a4c88dcf0a990e9b4f2d4388d56306564de5a741b9f4952ae9c057136c4c02cc6d306f3ca14df66058829e2b3d3147ddcc06f8268
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch b/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch
new file mode 100644
index 000000000000..311404993b84
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch
@@ -0,0 +1,24 @@
+From 79aeb3f4d3cc01761d99af5868c7fb5101cf2258 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:19:40 +0200
+Subject: Fix build with Qt 5.13
+
+---
+ plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp b/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
+index 423eb3a..dfcfb43 100644
+--- a/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
++++ b/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
+@@ -27,6 +27,8 @@
+ #include "skgmainpanel.h"
+ #include "skgtraces.h"
+ 
++#include <QMetaProperty>
++
+ #include <KFormat>
+ 
+ QVariant SKGDocumentTableFilter::doFilter(const QVariant& input, const QVariant& argument, bool autoescape) const
+-- 
+cgit v1.1
diff --git a/app-office/skrooge/skrooge-2.19.1.ebuild b/app-office/skrooge/skrooge-2.19.1.ebuild
deleted file mode 100644
index 8c3387f86cc6..000000000000
--- a/app-office/skrooge/skrooge-2.19.1.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_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities designer kde ofx webkit"
-
-REQUIRED_USE="test? ( designer )"
-
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql '' '' '5=')
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( dev-libs/libofx )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtquickcontrols)
-"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-		-DSKG_WEBENGINE=$(usex !webkit)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}
diff --git a/app-office/skrooge/skrooge-2.20.0.ebuild b/app-office/skrooge/skrooge-2.20.0.ebuild
index 191abf9bd101..8ec5d4ff9162 100644
--- a/app-office/skrooge/skrooge-2.20.0.ebuild
+++ b/app-office/skrooge/skrooge-2.20.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities designer kde ofx webkit"
 
 REQUIRED_USE="test? ( designer )"
@@ -75,6 +75,8 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtquickcontrols)
 "
 
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
+
 # hangs + installs files
 RESTRICT+=" test"