gentoo resync : 18.08.2019

4 files changed, 29 insertions, 127 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 28f426555e69..0871af7d0303 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,4 @@
-DIST kmymoney-5.0.4.tar.xz 11708760 BLAKE2B 62fd279039ef41078fddfc4a69d9a8e7c425965114ad91464ef94f7e8f72f07ed9cc16989d1ed6ee01fdc8cdd274afb231fbfe43e8a5e0c8d17c33aa17fcb70b SHA512 406460f33b32941796e8b0a2fb21f783db6c2444b35b0402647e688b78ecccb82401a7a1fa7c008ffd840cbd88c82db91e367be917f9ab7b231a0208b439b91f
+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
-EBUILD kmymoney-5.0.4.ebuild 3224 BLAKE2B 49d121d49979667fad2c537863da358a5ba61c008eb031afc9281a46b156c833477760dfd23050dcda73b45f4eaa00a296a34d829cf19958d12abd4d2508b044 SHA512 23f89a6494cb46a3690dc3d39e80ff8f56284c3cc4dcf02206a3265a2cae86f0dc10b0e5d17191ba8110c2884efa580262207c86518f0304af3e696e206b9d3f
-EBUILD kmymoney-5.0.5.ebuild 3227 BLAKE2B ef31c4de4105faecbc1cd13e31491040a549da8665b1c0b5109c8709fb0f8cb66e2a2846cabf087a3a4dff948c9a96cf636df070139f4e9d6129292baf9d6f52 SHA512 7cd6d196cb8db7c885664b2c1f9ecb2a6410390d11f4995998f165485e2d4ed045e9200fab39c7d5ce5d1a5f1460f61b9146568d614217420176026f2cc0a111
+EBUILD kmymoney-5.0.5.ebuild 3278 BLAKE2B 91e564fbfa0323bee326b1adad12c1c903161feb65707d3d001d6679f9eb51a1d21757578bcbffc247de0682a20d3b9d7706f8ac3567e4d8eb2947cb7dc7ee92 SHA512 755df5db3e7d4623498df44c9d0acf5ba4edea706d7d1e087d3ebf4422d011c254d9f711401323ba162c316ea557c1c45d21df189abcc3934fa26085e0adf56a
 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
new file mode 100644
index 000000000000..d365607aecf2
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.0.5-missing-header.patch
@@ -0,0 +1,24 @@
+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.4.ebuild b/app-office/kmymoney/kmymoney-5.0.4.ebuild
deleted file mode 100644
index f2f2db1d8a0d..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.4.ebuild
+++ /dev/null
@@ -1,123 +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"
-fi
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-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 )
-"
-
-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.5.ebuild b/app-office/kmymoney/kmymoney-5.0.5.ebuild
index 8ab833903522..44508ca3d7dc 100644
--- a/app-office/kmymoney/kmymoney-5.0.5.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.5.ebuild
@@ -15,7 +15,7 @@ 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"
@@ -90,6 +90,8 @@ RDEPEND="${COMMON_DEPEND}
 	quotes? ( dev-perl/Finance-Quote )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
+
 pkg_setup() {
 	use weboob && python_setup
 	kde5_pkg_setup