gentoo resync : 03.03.2019

5 files changed, 2 insertions, 243 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index ea93dd78139e..d076b5c7162b 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,8 +1,3 @@
-AUX skrooge-2.17.0-noqtwebkit.patch 1093 BLAKE2B d0798788899494bf794b2b7859ba8313e94d1c61b9b9b72a989c29eb02c703aee3aaedee474b2596077fd685f1206dfc187715af295c2425b65b66213bca8496 SHA512 6f745a69beb1e41a73a058940d12609c2dc0d990d777b410b2c8c269e9e314e03f3442cf58277f95229e1bf54f3c54ac90b21b497d0039f3deda6bd86e7dc3d5
-DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397
-DIST skrooge-2.17.0.tar.xz 23421972 BLAKE2B c0e08ef7235a6e05e945fcb92a222cc89e7a99ead4b30ba112fea7b420e150545e002e174b747bf7955415241eb55e8007d97e7fd92fa547a1f596360ab68156 SHA512 e65a1e1ed30af7c76776dbdf22f62d475ec3aece9c866453634d2692c6d1f1d6c00cb04376861cb3b09a990a3202f08dcb70ffe28f3c146cce17ade3a3a67a47
 DIST skrooge-2.18.0.tar.xz 20951548 BLAKE2B 7679c519cab88a165c878dbba0a077d7f4cddc9bd1252ce5fd1e6f2d90c98b9fc39b8251df83470debdc8a6fb4f093fcff55768aa41b6a4c379c9e4c4f558f25 SHA512 b8a222947f535eee9041e6bc71703a053fa9a201de352c5f39fcbf35be5259f76532ed5291becab4c676ff8eaba7727730f6d957af36bac54aa4ada11db25da3
-EBUILD skrooge-2.16.2.ebuild 2362 BLAKE2B f2733b59125117086e4d26bbe321feea256ac62cb187b8fc10ba1e74a895248676644d73d5a02613c3655133c0d1d5babc6d1c53f606265a9d60465e6d7a6fc9 SHA512 a46d06ec91d13303ae03201e9e015289392ec4771b4cba76b1b064e650df56cbbb2dbb65b996b5e899485cf4ce545f937aa1ff1d5c70a08b2239438f4612e03e
-EBUILD skrooge-2.17.0.ebuild 2562 BLAKE2B bc18ddfd8a8f75b2c6bc90e0b82e23fc554d97fe15b272de2cea05d2f6527af9f6c0dbda57a66f0d9f0b30c3fabdf223952ea5b1099f466af5dd4e2a98d9ce62 SHA512 de98233549721677d9e3a79d7f7b99d99c571867c43f099003f1ef28f5d30db70ee97c271695ee385b76f1e787417c5ee4676a71f0d2f22a3d4289b55494dae0
-EBUILD skrooge-2.18.0.ebuild 2500 BLAKE2B 16eb37bbe94292d07d9eafbbc585f2bed92dc9f82b58e5c626ba80f0fa8d58f846d92325c6e69eec9208df837ee598eb9a7ec5ea84094b77465204c53a8fe485 SHA512 f45d4c0af52b0f57600353d68cc1ff6a9acc7a26c48d3aa692f14bb3016a7f2d91e7a2d231038f8c367aa7b972048ada78ed95b5f0c8f8d6fe1f1f926ee097dd
+EBUILD skrooge-2.18.0.ebuild 2498 BLAKE2B 7f84d72f121f53b8468ece77cb7bfa38222298fa0c9dc96030cdba8944edb12b3b19bb8b9832c76bde11fe24c6a043725f975e694c330d72c7889bf5c9185795 SHA512 64d5705cdc86afd350600591ffa53980ac18ab8840993d0bd78dc84725584882327b00058e52cbbafeafa9fe49805ccca8088c770d3145aedba17c1d2cb1c8df
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
deleted file mode 100644
index 588c4c116e0c..000000000000
--- a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From dab0fd4adf2cbee89a417c483350ddffda77ed3b Mon Sep 17 00:00:00 2001
-From: Stephane MANKOWSKI <stephane@mankowski.fr>
-Date: Sun, 27 Jan 2019 17:13:28 +0100
-Subject: skrooge w/ -DSKG_WEBENGINE=ON: ui_skgtablewithgraph.h:15:10: fatal
- error: QtWebKitWidgets/QWebView: No such file or directory BUG:403575
-
----
- skgbasegui/skgtablewithgraph.ui | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui
-index e1a3058..b00273f 100644
---- a/skgbasegui/skgtablewithgraph.ui
-+++ b/skgbasegui/skgtablewithgraph.ui
-@@ -152,11 +152,6 @@
-  </widget>
-  <customwidgets>
-   <customwidget>
--   <class>QWebView</class>
--   <extends>QWidget</extends>
--   <header>QtWebKitWidgets/QWebView</header>
--  </customwidget>
--  <customwidget>
-    <class>SKGGraphicsView</class>
-    <extends>QWidget</extends>
-    <header>skggraphicsview.h</header>
-@@ -173,7 +168,6 @@
-   </customwidget>
-   <customwidget>
-    <class>SKGWebView</class>
--   <extends>QWebView</extends>
-    <header>skgwebview.h</header>
-   </customwidget>
-  </customwidgets>
--- 
-cgit v1.1
diff --git a/app-office/skrooge/skrooge-2.16.2.ebuild b/app-office/skrooge/skrooge-2.16.2.ebuild
deleted file mode 100644
index 3b71b9d132f3..000000000000
--- a/app-office/skrooge/skrooge-2.16.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-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)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(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 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libxslt
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	designer? (
-		$(add_frameworks_dep kdesignerplugin)
-		$(add_qt_dep designer)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/skrooge:4
-"
-
-REQUIRED_USE="test? ( designer )"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_use_find_package ofx LibOfx)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	kde5_src_test
-}
diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
deleted file mode 100644
index ec78c6db80c3..000000000000
--- a/app-office/skrooge/skrooge-2.17.0.ebuild
+++ /dev/null
@@ -1,104 +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)
-	$(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}
-	!app-office/skrooge:4
-	$(add_qt_dep qtquickcontrols)
-"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=$(usex test)
-		-DSKG_DESIGNER=$(usex designer)
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package kde KF5Runner)
-		$(cmake-utils_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.18.0.ebuild b/app-office/skrooge/skrooge-2.18.0.ebuild
index 266ebc136abe..ff20f250804d 100644
--- a/app-office/skrooge/skrooge-2.18.0.ebuild
+++ b/app-office/skrooge/skrooge-2.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities designer kde ofx webkit"
 
 REQUIRED_USE="test? ( designer )"