gentoo resync : 20.01.2020

8 files changed, 138 insertions, 99 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index c38f0b99fd91..29d4fdcbfdc3 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/auto-multiple-choice/Manifest b/app-office/auto-multiple-choice/Manifest
index 406aa0eacbda..51e828e253cd 100644
--- a/app-office/auto-multiple-choice/Manifest
+++ b/app-office/auto-multiple-choice/Manifest
@@ -1,5 +1,5 @@
 AUX auto-multiple-choice-1.3.0-conf.patch 1889 BLAKE2B aa39f1525f6067e8025094b3c7437f72c11eec7cb5b0fcbbe68388b80c1ff01050f2fc224671e1a6901f52d51e761f2702d17ce0e75f5ca67ffc8d721ef37cb6 SHA512 6c7cce8383dbbb23646b96785b69dd75f6d3e842d6712b3b5741a5151f7dde5a9ee05bd35e3dee374641f453128e8008304cc6001d9a1db707528ecb7b1ba496
 AUX auto-multiple-choice-1.3.0-desktop.patch 637 BLAKE2B bf06b2761d35b669b88a0915a273022045e169e09dd76ca4ae40723d44d57fabb518dec83f811124421cfc82a53cd1435c60c6763b534d6a3ae4449b2bc00de6 SHA512 b1eec21b2f640bfdf7a4d7d956a71b2fa9889a6d5428cc7eedc1352e845477c3a81607d0c1502b4f57967264384aff5dcc2162bb552544b962c383dc7f978ffa
 DIST auto-multiple-choice_1.3.0_sources.tar.gz 4328255 BLAKE2B 7c6337cfa0a12d8dcd9fa640e636c300234ba7e7a34e95a523c5f9836f934da336f6ce792932fffb97b28ae02c577166a3d4d3ea4fd6959786a5c60510b454a2 SHA512 fcfacd071072f5773556c706b6fa0aea4ff3f3752f3a1f40c9e6de7ec870e939adc57e6bd4c90cac80241cc798e02a71c9fc80d9ccf25ad3a10752f937d06da5
-EBUILD auto-multiple-choice-1.3.0-r1.ebuild 2486 BLAKE2B 1c4b23c10a1a39156a08b0b35d8711da08bbf0d2f8964bb1740ecad9eed2fc470ad3011d5456b8f709557a8c06880fc8996c7986d0f512fc1a7075601e7b52bc SHA512 dbbb20f11e87687a7effe92cb50fc0e1362bab557d1fbe76a34ee9c3d60f100e79e8bdae1f53792dab3264bb6cb8ce05299b2e56a0044afe0fe0043616ad5535
+EBUILD auto-multiple-choice-1.3.0-r1.ebuild 2501 BLAKE2B 0ecaf9368a391ebbb1d775dd001890e95fc926fbbfc7d038fe45fd8d0e0d270e542ee93df7d59583f41926ffb351ecb96bf6c8dff6c0beeaf120bf6cf317b485 SHA512 8f19f0fc599063298b49742081af8b6c5c80f0d9196e35db19d7a8f4f90205d903e93aaeb73841d273e449380097c1476641e18883e70bf7862c0688587d508c
 MISC metadata.xml 261 BLAKE2B 25f9632b77cadd3d9a88cbc5d94c57db930ec7ecd88a7c418a6a8ae798335c985956f6ac28efa31351675db2eb27ac9866183916c622fbce4c6160f05e58f281 SHA512 ede311f7ddc41ead154035127d3a679c6847af76712bf0d30a4175daa8c436a9eb78ed80fee67eaf8ee2a194985c8e1059aa80b26591e640999727a8f10ce6e1
diff --git a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
index a3734539e03f..5a147ebd06cc 100644
--- a/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
+++ b/app-office/auto-multiple-choice/auto-multiple-choice-1.3.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs perl-functions latex-package
 
@@ -21,7 +21,7 @@ for lala in ${LANGS}; do
 	IUSE="${IUSE} l10n_${lala}"
 done
 
-CDEPEND="
+COMMON_DEPEND="
 	app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers]
 	app-text/poppler:=
 	dev-perl/XML-LibXML
@@ -30,12 +30,12 @@ CDEPEND="
 	l10n_fr? ( app-text/texlive[l10n_fr] )
 	l10n_ja? ( app-text/texlive[l10n_ja] )
 "
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	app-text/dblatex
 	app-text/docbook-xml-simple-dtd:*
 	app-text/docbook-xsl-stylesheets
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	app-text/pdftk
 	dev-lang/perl:=
 	dev-perl/Glib-Object-Introspection
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index ac089798d1da..986b8de3798b 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,5 +1,3 @@
-DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9 SHA512 cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d110222256bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5
 DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B b02248ac51c4593434f234b574c23c68fe6777787451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d SHA512 9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915
-EBUILD calligraplan-3.2.1.ebuild 2451 BLAKE2B 0dffdccaafec994cdeab70b41accd6586ec848869a574e79aeee7a1a62d9fae8342d3411c4de2ed9ab3363638f51333fc8d8280e7b288cf738e187cae9e882b6 SHA512 131372915c9a45d45519840ad8c3227ee774910494ff632724f26b7bb12050ef06a6807cc0a00b9eb1ba41854c255cf72589dc4249d80c12d3068a1414eba39e
-EBUILD calligraplan-3.2.2.ebuild 2453 BLAKE2B f8326c8f691db08c9c7045e4f37f6680086c2a5bdbbff5e633173a0936d827e03656ab8485038de4dec65dd0c45d8ff3c7cd7298d3e22d00b0a95d41f775ff2e SHA512 f3160ed5c5c05190d84bd5c4d9f09b9d23ebba17f13ec339d68220c752c81d8d7cd3bbcaf949231b27be3e7f78b3f89d19bdc88c4e4db4152edaec8f8e9fd23c
+EBUILD calligraplan-3.2.2.ebuild 2451 BLAKE2B 6bf7d239e8d1955a4a33af9d6eb1256f5d1a3d9e3d4cfadf30e653b0179cbac0cd33eb6f09b6aa363c0eaed8e57bb52a2e3baecd5dc0225190c830684bd07e0c SHA512 fb291924401c6af560693f7992610abc731b3ea6eb812786f6e11ec836b9844b43ee7949eb4db4077f32bb2179db03120ce1f687f4885ec7a473706f5a3eba4a
 MISC metadata.xml 649 BLAKE2B 24dd20d4a19187e71952aad0d157b7b66adbbd8de24344e2de7aabe714cffd1db1f69f88b34aed13dfadaa62c51b3be7bc057f651d6388a0e98595688db3dc1b SHA512 44d54e0b08e4422a504a0107c73c7cbd2186698f60bc40b2c523d302150de877a86c482edb6b59ac613ef1a4ea2f04f1124ab7ab6e00c42a097a51e55a0a1dcc
diff --git a/app-office/calligraplan/calligraplan-3.2.1.ebuild b/app-office/calligraplan/calligraplan-3.2.1.ebuild
deleted file mode 100644
index c610d97f9c28..000000000000
--- a/app-office/calligraplan/calligraplan-3.2.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://www.calligra.org/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +holidays kwallet X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	dev-lang/perl
-	dev-libs/kdiagram:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	kwallet? (
-		app-crypt/qca:2[qt5(+)]
-		>=kde-frameworks/kwallet-${KFMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!app-office/calligra[calligra_features_plan(-)]
-	>=dev-qt/qtsvg-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package holidays KF5Holidays)
-		$(cmake_use_find_package kwallet Qca-qt5)
-		$(cmake_use_find_package kwallet KF5Wallet)
-	)
-	# Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
-	ecm_src_configure
-}
diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild b/app-office/calligraplan/calligraplan-3.2.2.ebuild
index 45620a30fd04..a8dc309bb5c0 100644
--- a/app-office/calligraplan/calligraplan-3.2.2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index aff869142a89..e51871054cc1 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,3 +1,5 @@
 DIST kmymoney-5.0.7.tar.xz 11667088 BLAKE2B 4d523bb9ea5d41dc6aa6e52b0b982384c6e6ad3cf6981e961f137320a36fc395136b81dfd3b8c8085375c46dc9affaa5b746f9250cce72a6c8ad6af669e5109c SHA512 af0663bc7ac3fe59a8c7db09942bbb8a182ea5f7ee3bdc05e7ed449c7172040de2282997db95fcce823f7d3d8f6f2b43229b5e4ba3b349eb8ea3b2756636f6ed
+DIST kmymoney-5.0.8.tar.xz 11753276 BLAKE2B 0c4967b3f39ec675b9bd7e8e81e230c7f5efa574671138db57396984add802d9b6c28e383eaaddb4ee8d486e6dcc2b0ac54f5cf1129aa4dafb9bd1cf4235914f SHA512 f332327dd40cc5667cd0141bd8e0c9cd81a2d996a4d482b2976f6bbd258cc27c73b2190d4631b8e0b9ee9d435ef8934312da399234830eb51b3e4ec942350988
 EBUILD kmymoney-5.0.7.ebuild 3432 BLAKE2B 86415f5787cd87156a7bc3057a2f9c1d1be590fe424800ed9a8a544763e82d44932d405bd6102ebb0a28aee8719f7fa0ef5e729489c5f84e8d2bea386bbb85d3 SHA512 ba80fbbb879e11520348d40928067554535a1e400d960dc208ef87101db96b4937982dc569e7f27c7f9bac2018659d417d778d1753f06004e476200852f4762d
+EBUILD kmymoney-5.0.8.ebuild 3421 BLAKE2B e9dc2fc9be2b4fe64689c03b3098b43627c6d3184de8317a16109568e08823bd41ab4b74ed07fb444af97523a83a73f1eb4fdbd735e5cd96bbb2fb8d166f00ce SHA512 cd21e7db1dd8b1c70d381a76dfc60774a7a1374a7d3097ac00e419774674cfd34bb3bcca9a582f1045b8ef8af95d34cca5f9bd9076f9600dfbe7048009fe37dc
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.8.ebuild b/app-office/kmymoney/kmymoney-5.0.8.ebuild
new file mode 100644
index 000000000000..62e386a04571
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.0.8.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org 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"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
+
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.7.1-r1[cxx]
+	>=app-office/libalkimia-7.0.0:=
+	dev-libs/gmp:0=
+	dev-libs/kdiagram:5
+	dev-libs/libgpg-error
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	addressbook? (
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+		kde-apps/akonadi:5
+		kde-apps/kidentitymanagement:5
+	)
+	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=net-libs/aqbanking-6.0.1
+		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
+	)
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	ofx? ( dev-libs/libofx )
+	webkit? (
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	)
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	weboob? (
+		${PYTHON_DEPS}
+		>=dev-qt/qtconcurrent-${QTMIN}:5
+		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
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package addressbook KF5Akonadi)
+		$(cmake_use_find_package addressbook KF5Contacts)
+		$(cmake_use_find_package addressbook KF5IdentityManagement)
+		-DENABLE_LIBICAL=$(usex calendar)
+		-DENABLE_KBANKING=$(usex hbci)
+		$(cmake_use_find_package holidays KF5Holidays)
+		-DENABLE_OFXIMPORTER=$(usex ofx)
+		-DENABLE_WEBENGINE=$(usex !webkit)
+		-DENABLE_WEBOOB=$(usex weboob)
+		$(cmake_use_find_package weboob PythonLibs)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 652636; bug 673052: needs kmymoney installed to succeed
+	local myctestargs=(
+		-E "(reports-chart-test|qsqlcipher-test)"
+	)
+
+	ecm_src_test
+}