gentoo resync : 08.06.2019

3 files changed, 4 insertions, 131 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index f3d9a1c2c04a..7d6881115a6e 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,3 @@
-DIST kmymoney-5.0.3.tar.xz 11690060 BLAKE2B beb836c4753caa81ee3a06f12fce65fd584fbeaa228cba087b77284e0f3ecce8b88b030466198db62fdf23af26cee5caad59eb845653006d700cf68a0793231f SHA512 9f8aaa26a3cb3f5eb2a61936ecc54f97096f98d4f0ffbfbfb6adbe099a559f797d997b1d23bb7f18d31d76182f8fa8601a70176a4bc16f5cdf2fac0af8903fc0
 DIST kmymoney-5.0.4.tar.xz 11708760 BLAKE2B 62fd279039ef41078fddfc4a69d9a8e7c425965114ad91464ef94f7e8f72f07ed9cc16989d1ed6ee01fdc8cdd274afb231fbfe43e8a5e0c8d17c33aa17fcb70b SHA512 406460f33b32941796e8b0a2fb21f783db6c2444b35b0402647e688b78ecccb82401a7a1fa7c008ffd840cbd88c82db91e367be917f9ab7b231a0208b439b91f
-EBUILD kmymoney-5.0.3.ebuild 3200 BLAKE2B a97e6f49841042928fdf88f3480540e05bc84dd18c833172a56d73df6b74eccc56b0f398326073f95226d4a2524813c957542055a4e195e4df06b0120f72407b SHA512 734e6756d2bca72650b87b7fa25ed9d82d3905d18aad0ed72a560b56b6653da36113626899de587f792cb59a46c8661e3476471e548ff26355e7dbeaf4f56b3e
-EBUILD kmymoney-5.0.4.ebuild 3161 BLAKE2B c108031005cd76da3c921fad1ac3d96bd86e992f0d700c55ff0ef989b90b3d840d1ccc69a5e228b6ff98bdec5452cf68a76b5252353e7e9563b573cf1da7bcde SHA512 adde5db52f0fc02a2cd0b044350cd65d6648b7226085dabc1150f36c1559874b6f7c115488dcb4056d840eefa71b5a91809077201fb4f26be16686593c5a927d
+EBUILD kmymoney-5.0.4.ebuild 3224 BLAKE2B 49d121d49979667fad2c537863da358a5ba61c008eb031afc9281a46b156c833477760dfd23050dcda73b45f4eaa00a296a34d829cf19958d12abd4d2508b044 SHA512 23f89a6494cb46a3690dc3d39e80ff8f56284c3cc4dcf02206a3265a2cae86f0dc10b0e5d17191ba8110c2884efa580262207c86518f0304af3e696e206b9d3f
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.3.ebuild b/app-office/kmymoney/kmymoney-5.0.3.ebuild
deleted file mode 100644
index 15c71b919146..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_BRANCH="5.0"
-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"
-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
-	local myctestargs=(
-		-E "(reports-chart-test)"
-	)
-
-	kde5_src_test
-}
diff --git a/app-office/kmymoney/kmymoney-5.0.4.ebuild b/app-office/kmymoney/kmymoney-5.0.4.ebuild
index 9c92a22c0aec..f2f2db1d8a0d 100644
--- a/app-office/kmymoney/kmymoney-5.0.4.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.4.ebuild
@@ -18,7 +18,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} )"
@@ -114,9 +114,9 @@ src_configure() {
 }
 
 src_test() {
-	# bug: 652636
+	# bug 652636; bug 673052: needs kmymoney installed to succeed
 	local myctestargs=(
-		-E "(reports-chart-test)"
+		-E "(reports-chart-test|qsqlcipher-test)"
 	)
 
 	kde5_src_test