gentoo resync : 24.12.2018

5 files changed, 2 insertions, 188 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 4b099eb9f1e4..7a2ca80a64d9 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,7 +1,3 @@
-AUX kmymoney-5.0.1-cmake.patch 1089 BLAKE2B 5574c6bebd5502a4f6046a57c14593b5b305734981bf04fe19bc500ccb76dcc56e851213b011c4cef41795d9134e970fb5a83e7372cf928136efbbf84451ace1 SHA512 dc894facca9ff086b92397b8fde830fee54593130eb52523ba8d3c517d037f98af8639918007a4970ce1c0e1df88208dd06a80fa6cf5d00ea6a7e06269702b74
-AUX kmymoney-5.0.1-qt-5.11.patch 735 BLAKE2B 25fbe640be8474010ea8417aece91baa475e3fe2e1bf4b432093496cf8d435fdccf995b9239eeb2744e39946a0a69a5fb0f2252dbe1c73f52e163b0d61678d4d SHA512 7cd3fb3b85c47aad71d049ad71047ed38597449300cfdf17f9eca4cf7429ea931056088fe03e88b238730f770b6ed757db4a388d4596a718341fa37985dd478d
-DIST kmymoney-5.0.1.tar.xz 13307860 BLAKE2B df61285f848df693510f1807bbf66b7cfec4498f2c540df3420731734a8ced8c4ae6426e338af2cecc85278120087eddc261a9e35bad50722991e3bb617d4a9c SHA512 74ace8d98f144c503d572c68cf50c27664a49bc5f4428788b69a1da52b8f72e97e1bb70914dbf041c43884c3b6340e28390618dec179ebe3d1b3ea63bede93e7
 DIST kmymoney-5.0.2.tar.xz 11682108 BLAKE2B 310ec19938950f05654555be1c1f0091233e1c3e497c9481ff0a199ad8f34efe517fb5f2c54cf6e521b03bddf9aec89976e346f1dba72b1f245c4d8af349864a SHA512 a2d6e28a68a7d8bf05e4a0c88b398ff8d9b644384d7113e6abeea4572df8b054a31edaaddd6cad7dc5aaddef492c0477df3a92a4e2d4efdfba7722f54453ca47
-EBUILD kmymoney-5.0.1-r2.ebuild 3133 BLAKE2B 7903b6f072e7e01d52193d459547d629baecdb27564e727b796597b897604de2d30838acc17c3029555a2eccd0eda9d058d28cf3f3a183c004dd7b454aa3ea3f SHA512 8a4e41ab95ada9412f7f1db529cb2ee461413c6ddc3f0c9d956ac679d1589b36ab64b596ee51879f3c6f5c0abf0c114ea2e8b6ff32e879d337291b06403073e5
-EBUILD kmymoney-5.0.2.ebuild 3203 BLAKE2B 928afa604d74ef2a09c81ecd270bc47d45e1143048cfc8ac62c0b78b1984253bb4bf161e616dc6c3769b68f38e5a33027760dd565323b832ff7aa8f00180cb22 SHA512 540e851a73af6f258b24bca7f2e0d09b965d0135076aa960691a34f1b932de602b093ef763f04683e4f1c4ac8b3c2b5ecc93a5eaf238761ab3a95d0441af4bd9
+EBUILD kmymoney-5.0.2.ebuild 3201 BLAKE2B 74a73a9eb9d32afd999deedad63db47a24249b68111779477a6bba27cbd5641305be3faf440f21e17e202eec3f97f71c2e636dfb2a1b35c0362ec87f96151b4a SHA512 6ce1a81bc99cd11d4359eb0fb3381469b8397e2e117e50896deda4e80a3087a0097299de7397449fd2e438313094707595de2d60b150f1fb1760672666ebd953
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch b/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch
deleted file mode 100644
index 7ba8349b0fed..000000000000
--- a/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/files/kmymoney-5.0.1-qt-5.11.patch b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
deleted file mode 100644
index 4158e0f8ed5b..000000000000
--- a/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e5198a902996b27bf9abde0ad24af82d55ab5dc1 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Thu, 10 May 2018 09:35:34 +0200
-Subject: Fix build with Qt 5.11
-
----
- kmymoney/plugins/kbanking/widgets/chiptandialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
-index 928e7a8..53fb2a3 100644
---- a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
-+++ b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
-@@ -28,6 +28,7 @@
- #include <QQuickView>
- #include <QQuickItem>
- #include <QPushButton>
-+#include <QRegExpValidator>
- #include <QStandardPaths>
- 
- #include <KLocalizedString>
--- 
-cgit v0.11.2
diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
deleted file mode 100644
index 7891db19927c..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 python-single-r1
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-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)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdewebkit)
-	$(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 qtwebkit)
-	$(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
-	x11-misc/shared-mime-info
-	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 )
-	weboob? (
-		${PYTHON_DEPS}
-		$(add_qt_dep qtconcurrent)
-		www-client/weboob[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
-)
-
-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=OFF
-		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake-utils_use_find_package weboob PythonLibs)
-	)
-	kde5_src_configure
-}
-
-src_test() {
-	# bug: 652636
-	local myctestargs=(
-		-E "(reports-chart-test)"
-	)
-
-	kde5_src_test
-}
diff --git a/app-office/kmymoney/kmymoney-5.0.2.ebuild b/app-office/kmymoney/kmymoney-5.0.2.ebuild
index a4727919389e..4e3d5e4fb8c6 100644
--- a/app-office/kmymoney/kmymoney-5.0.2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.2.ebuild
@@ -20,7 +20,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"