gentoo resync : 07.04.2018

3 files changed, 11 insertions, 163 deletions

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 439a4cbb7ada..bc4f258be37d 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,6 +1,4 @@
 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.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.1-r2.ebuild 3042 BLAKE2B c8f5636352b7c370d3b0c33a1eab1642b7616bd019c80e1bdcbffa5698286caa708a276451ecf54738c72d0ba7d829ba4daa7a325cea034391c6daed013d7069 SHA512 79a8756396dd535e6506f61deaf7857a34fca38292854dfcfef7932fbb7a14f0c534ecd3b6bb998146ad7366bdff7d858c9476798105d998797dac8719495443
+EBUILD kmymoney-5.0.1-r2.ebuild 3139 BLAKE2B 8e372597b3e759bc9b2d98b911e2bf0f1ea5b44bea5423ed7b349c29e0642f447f8d68e0024f817260bf80772c5f528c541f39e04a0c27e71620901e4cdf88fc SHA512 b806f365594fdc062993a6b0441f4c918e2178348828a4cdc5b6a9efeea328f6fac2f9b6e81f5ed31b4d55985d7c077d10f034ff825ff80736e803d9afdbb093
 MISC metadata.xml 787 BLAKE2B 090845c035b23d5dd951c6836a154c74736597c05f52a6841596d1d3663085176aae10ae54489eb6152faa82a5c77dbe7001861c63ca1b6191a534022e1be5bc SHA512 19f3d92cb3b3e92ce1692d76af59bc474257948a4740300484f17eecca391b0a4f6f5517fe6dd06d513231706c1123cf1e955ea6fb3a321d2fbc71063da68586
diff --git a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild b/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
deleted file mode 100644
index 34a425616785..000000000000
--- a/app-office/kmymoney/kmymoney-4.8.1.1-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="Personal finance manager by KDE"
-HOMEPAGE="https://kmymoney.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="calendar debug doc +handbook hbci ofx quotes test weboob"
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.0[cxx]
-	<app-office/libalkimia-6.0.0
-	dev-libs/gmp:0=
-	dev-libs/libgpg-error
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	kde-frameworks/kdelibs:4
-	x11-misc/shared-mime-info
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.5.1
-		>=sys-libs/gwenhywfar-4.15.3[qt4]
-	)
-	ofx? ( >=dev-libs/libofx-0.9.4 )
-	weboob? ( www-client/weboob )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-frameworks/oxygen-icons:*
-	handbook? ( kde-frameworks/kdelibs:4[handbook] )
-	quotes? ( dev-perl/Finance-Quote )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	handbook? (
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xsl-stylesheets
-	)
-	test? ( dev-qt/qttest:4 )
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ -v LINGUAS ]] ; then
-		pushd po > /dev/null || die
-		local lang
-		for lang in *; do
-			if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
-				case ${lang} in
-					CMakeLists.txt) ;;
-					*) rm -r ${lang} || die ;;
-				esac
-				cmake_comment_add_subdirectory ${lang}
-				sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
-					-i CMakeLists.txt || die
-			fi
-		done
-		popd > /dev/null || die
-	fi
-
-	if ! use handbook; then
-		cmake_comment_add_subdirectory doc
-	else
-		if [[ -d doc && -v LINGUAS ]] ; then
-			pushd doc > /dev/null || die
-			local lang
-			for lang in *; do
-				if ! has ${lang} ${LINGUAS} && [[ ${lang} != "en_US" ]]; then
-					cmake_comment_add_subdirectory ${lang}
-				fi
-			done
-			popd > /dev/null || die
-		fi
-	fi
-
-	# don't install as executable
-	sed -i kmymoney/CMakeLists.txt \
-		-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
-}
-
-src_configure() {
-	use debug || append-cppflags -DQT_NO_DEBUG
-
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DUSE_DEVELOPER_DOC=$(usex doc)
-		-DENABLE_KBANKING=$(usex hbci)
-		-DENABLE_LIBOFX=$(usex ofx)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON
-		-DKDE4_BUILD_TESTS=$(usex test)
-		-DENABLE_WEBOOB=$(usex weboob)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile apidoc
-}
-
-src_test() {
-	local kded4_pid
-
-	_test_runner() {
-		export $(dbus-launch)
-		kded4 2>&1 > /dev/null &
-		kded4_pid=$!
-
-		cmake-utils_src_test
-	}
-
-	unset DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
-
-	local myctestargs=( -E "(kmymoney-querytabletest)" ) # requires ktimezoned
-	virtx _test_runner
-
-	if [[ -n "${kded4_pid}" ]] ; then
-		kill ${kded4_pid}
-	fi
-
-	if [[ -n "${DBUS_SESSION_BUS_PID}" ]] ; then
-		kill ${DBUS_SESSION_BUS_PID}
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}/apidocs/html/." )
-	cmake-utils_src_install
-
-	# We don't want /usr/share/doc/HTML to be compressed,
-	# because then khelpcenter can't find the docs
-	[[ -d ${ED%/}/usr/share/doc/HTML ]] &&
-		docompress -x /usr/share/doc/HTML
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
index eb313fe8717f..c1e3975e0277 100644
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://kmymoney.org"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities addressbook calendar hbci holidays ofx quotes weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
@@ -114,3 +114,12 @@ src_configure() {
 	)
 	kde5_src_configure
 }
+
+src_test() {
+	# bug: 652636
+	local myctestargs=(
+		-E "(reports-chart-test)"
+	)
+
+	kde5_src_test
+}