gentoo resync : 17.02.2020

4 files changed, 2 insertions, 130 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 861e46dcfe85..23026248ad6a 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,6 +1,3 @@
-AUX skrooge-2.20.0-missing-header.patch 870 BLAKE2B 8aafc1b0fbc8ddb4f94c1bbfdbf077ae0b2da6ea52e314e51461e503c3e99a5183c5d4e6569bfd76d7639f76b2aad5448944cb5bb33a6afd2fd2c7163eb27776 SHA512 81f6e9b0938430de6c71c708cd0072fac3cf5236f8adea2f6451bbb6676abff854e2f4d751fd09c95f9fc05657d56733a0e30f7423664a1341d981fbb731c87a
-DIST skrooge-2.20.0.tar.xz 21787404 BLAKE2B b289bbec8d6e369298a142360cc07c6d522d44969c55c68de70df4a9ad574e2a07e9b349091bb8b902408afc709552692557363ef9e7ca2a4375abc41236cd3f SHA512 5b4a9b5b17e24e222a99024bfed03d126df117d4b0af5b5828248ecb08df72dc595225290f811c9a5d45b552f465d361f19f95c4c1ef492bb39db38aa68fa96c
 DIST skrooge-2.21.1.tar.xz 21487048 BLAKE2B 64eeb2e14a18e57f8fd89985e28e3b2736e4ece2ffc5132478531ba19a6f7ad821a5198570f01fd6bb3ad79410ba69bc7b0cdf8c5a85243bff3a879ad2458a2d SHA512 7d87576b38bd0dea1718babd818115b56cdae9183ca6b7b7631bcf749f2ed2b6a49989275fa5603906e08457bcaaf66404b4a76e31c6b84653f40e5b249d31c5
-EBUILD skrooge-2.20.0.ebuild 2521 BLAKE2B 817d6e7d910b223e9d7770f48f14bcd64c16d2743f491e1eb50636655a6c402c0bbd60cc444181bcf427c34c0ff773f7ae15b903e15e760aaec218d22819f1c2 SHA512 128289c9d23c7c2c16d3fb9868f480ecaced88287bce423d5d80ed67d047e94cb238b141ddfa6a66e840c7199247160d34227414148bceeda3b3b901ccc5d43f
-EBUILD skrooge-2.21.1.ebuild 2757 BLAKE2B 98d05402add21c9614078f6b5cdcc21c0fe98ceca79b8516a1497c01cc2731ebe4f64b4245ee2ffd9fc82663fa34a5f585a902cbf91f90f314456b58d7db0c86 SHA512 8df6891916d7bb8430e350a15be393cc2403413ce3493233d4175f08e30dac2714ac007c301b5e518373795995fce4f18004d8647a9c4fcc7207d0e9e9689506
+EBUILD skrooge-2.21.1.ebuild 2756 BLAKE2B 8635c6811904b0fa990e4751b1c45cca81f6840c8a5c6b9633d2b232faec20e796cdccef508aefa88d7bf1a5fe48ad30fd190e4bcce39769c4a0ee45e5662f7e SHA512 b278fca5a79b40daccfeeaea726a73bacbe5d8a88b6d12d42001cc70e2b2dcd5c7cc1c73b9c5ad786881ab610314db819129e04dbfa7018ea5bb31bcdaf8ea33
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch b/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch
deleted file mode 100644
index 311404993b84..000000000000
--- a/app-office/skrooge/files/skrooge-2.20.0-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 79aeb3f4d3cc01761d99af5868c7fb5101cf2258 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:19:40 +0200
-Subject: Fix build with Qt 5.13
-
----
- plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp b/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
-index 423eb3a..dfcfb43 100644
---- a/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
-+++ b/plugins/generic/skg_monthly/grantlee_filters/skgdocumentfilter.cpp
-@@ -27,6 +27,8 @@
- #include "skgmainpanel.h"
- #include "skgtraces.h"
- 
-+#include <QMetaProperty>
-+
- #include <KFormat>
- 
- QVariant SKGDocumentTableFilter::doFilter(const QVariant& input, const QVariant& argument, bool autoescape) const
--- 
-cgit v1.1
diff --git a/app-office/skrooge/skrooge-2.20.0.ebuild b/app-office/skrooge/skrooge-2.20.0.ebuild
deleted file mode 100644
index 7d87ce4cec46..000000000000
--- a/app-office/skrooge/skrooge-2.20.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities designer kde ofx webkit"
-
-REQUIRED_USE="test? ( designer )"
-
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql '' '' '5=')
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	activities? ( $(add_frameworks_dep kactivities) )
-	kde? ( $(add_frameworks_dep krunner) )
-	ofx? ( dev-libs/libofx )
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtquickcontrols)
-"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package kde KF5Runner)
-		$(cmake_use_find_package ofx LibOfx)
-		-DSKG_WEBENGINE=$(usex !webkit)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}
diff --git a/app-office/skrooge/skrooge-2.21.1.ebuild b/app-office/skrooge/skrooge-2.21.1.ebuild
index e78009944068..49a210b9ac01 100644
--- a/app-office/skrooge/skrooge-2.21.1.ebuild
+++ b/app-office/skrooge/skrooge-2.21.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://skrooge.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"