gentoo resync : 23.03.2018

3 files changed, 53 insertions, 6 deletions

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
 }