gentoo resync : 24.12.2018

5 files changed, 12 insertions, 111 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 36682a4cec9b..b456c901c225 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,6 +1,5 @@
-AUX skrooge-2.14.0-designer-optional.patch 3425 BLAKE2B 735941612ef1e99db255a23cdc00fd83a05b901c742a30e211f73296fcb05149cb620e510f795e236a6abaaade1fe5898d149863e125afaa1da392cc3f074eca SHA512 872e3d824a812c7fe75b61cfdae25910ecd5562304b023035b3f3c208b32144435f109c207a8cb2dd56fdf49abedb730fa00029d388a196eab63751c5f2376ec
-DIST skrooge-2.15.0.tar.xz 20704388 BLAKE2B 37280e039595b5c7b3cb1af0fd20f66cc96c5796995c7a9ef4b83878c9a835856e54804ca312bcbb46d6de599a17dd49e45ef0e1dc1e6492b642ed36d88d731b SHA512 c49f8a84d7339ff2b96f27a7895bbfe5f75c33534c7c4f95e47ebd9787bf3e80847139e4a257bc3bdd12e853bfd2131173a66c436cbc3165e1ac7a5ae684eab0
 DIST skrooge-2.16.2.tar.xz 21005424 BLAKE2B c8e11df29defc714fe71ad4f488cd6207dcc8bfc0cbee28422682f9c683ed7af8200b84f90cfdd0ca6d0bd0292dab46724c6b9afa0155c9f1603bbbe189b001d SHA512 4bc7de279cf55888a258700c2a8450270904066684b1ce0b121cf5eb966da174d969daa3db432781de62d94420e706ab5364e386e053dde7617d967442eae397
-EBUILD skrooge-2.15.0.ebuild 2426 BLAKE2B d63d80c1cf5f1b986ff1de0564a0254572eca38ec0a0e53bbd0646c27290a6612d12cc62c3c96c96d089b638432bf4734e30483b425319813bc7d60315fff8b3 SHA512 81c8da5264cf597e1499f2ffaad6dbf964da3f29cbf9981348a6ebf51b4181c0cd98a99b593d25e373d49f814b5a04fb1ea20deb673286f6361ede38103809eb
-EBUILD skrooge-2.16.2.ebuild 2364 BLAKE2B 47653cd398fb8cf640fe8f850dd1e34b8e7fb1d8503e3d6561019d612208364f57fe47e6c5b5d18eec08b8c59439086e68abe0f6c86f091c3af96d4e51bb9c5e SHA512 6a9f71463afa4312c1f2214b0df836586295e43bb6f9226f4e7f010174d5dd88af981c78fa7c0db212f63a50964946bb8947fede0fd064ed38a968b68aea0aad
-MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
+DIST skrooge-2.17.0.tar.xz 23421972 BLAKE2B c0e08ef7235a6e05e945fcb92a222cc89e7a99ead4b30ba112fea7b420e150545e002e174b747bf7955415241eb55e8007d97e7fd92fa547a1f596360ab68156 SHA512 e65a1e1ed30af7c76776dbdf22f62d475ec3aece9c866453634d2692c6d1f1d6c00cb04376861cb3b09a990a3202f08dcb70ffe28f3c146cce17ade3a3a67a47
+EBUILD skrooge-2.16.2.ebuild 2362 BLAKE2B f2733b59125117086e4d26bbe321feea256ac62cb187b8fc10ba1e74a895248676644d73d5a02613c3655133c0d1d5babc6d1c53f606265a9d60465e6d7a6fc9 SHA512 a46d06ec91d13303ae03201e9e015289392ec4771b4cba76b1b064e650df56cbbb2dbb65b996b5e899485cf4ce545f937aa1ff1d5c70a08b2239438f4612e03e
+EBUILD skrooge-2.17.0.ebuild 2498 BLAKE2B 52f7a523a29ad49b2568fa0bfca83e1c4636a9bc42faf658fc4f71a49f3ad85a98d806af7c47d2616c73402ccb34c904a71cf33a980137c355c50e313080f47a SHA512 84e36e0ed95ef81cfff139bb352434cc4e12b89c58ec586552a86c3ec677cc3458e4fcc7ba066f0088400e398d6cdf3de3319856e01373783c92b783aea7a922
+MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch b/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
deleted file mode 100644
index e34e80b78af1..000000000000
--- a/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From b83f0a0d1171fab0d839de23b97e0ffe3aae4d3e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 5 Sep 2018 08:46:09 +0200
-Subject: [PATCH] Fix build with SKG_DESIGNER=OFF
-
-Summary: cmake was adding designerplugin code to build with SKG_DESIGNER=OFF.
-
-Reviewers: #skrooge
-
-Differential Revision: https://phabricator.kde.org/D15282
----
- skgbankgui/CMakeLists.txt | 12 +++++++----
- skgbasegui/CMakeLists.txt | 44 +++++++++++++++++++++------------------
- 2 files changed, 32 insertions(+), 24 deletions(-)
-
-diff --git a/skgbankgui/CMakeLists.txt b/skgbankgui/CMakeLists.txt
-index 9bb197f3d..17c7c6ca2 100644
---- a/skgbankgui/CMakeLists.txt
-+++ b/skgbankgui/CMakeLists.txt
-@@ -26,12 +26,16 @@ SET(skgbankgui_SRCS
-     skgpredicatcreator.cpp
-     skgquerydelegate.cpp
-     skgunitcombobox.cpp
-+)
- 
--    skgquerycreatordesignerplugin.cpp
--    skgbkwidgetcollectiondesignerplugin.cpp
--    skgpredicatcreatordesignerplugin.cpp
--    skgunitcomboboxdesignerplugin.cpp
-+IF(SKG_DESIGNER)
-+    SET(skgbankgui_SRCS ${skgbankgui_SRCS}
-+        skgquerycreatordesignerplugin.cpp
-+        skgbkwidgetcollectiondesignerplugin.cpp
-+        skgpredicatcreatordesignerplugin.cpp
-+        skgunitcomboboxdesignerplugin.cpp
-     )
-+ENDIF()
- 
- SET(LIBS Qt5::Xml skgbankmodeler skgbasemodeler skgbasegui)
- IF(SKG_DESIGNER)
-diff --git a/skgbasegui/CMakeLists.txt b/skgbasegui/CMakeLists.txt
-index 112efe267..81b0bf8de 100644
---- a/skgbasegui/CMakeLists.txt
-+++ b/skgbasegui/CMakeLists.txt
-@@ -63,28 +63,32 @@ SET(skgbasegui_SRCS
-     skgshow.cpp
-     skgwidgetselector.cpp
-     skgsimpleperiodedit.cpp
--
--    skgwidgetcollectiondesignerplugin.cpp
--    skgtabwidgetdesignerplugin.cpp
--    skgtablewidgetdesignerplugin.cpp
--    skgtableviewdesignerplugin.cpp
--    skgfilteredtableviewdesignerplugin.cpp
--    skgtreeviewdesignerplugin.cpp
--    skgcomboboxdesignerplugin.cpp
--    skgcolorbuttondesignerplugin.cpp
--    skgwidgetselectordesignerplugin.cpp
--    skgwebviewdesignerplugin.cpp
--    skgzoomselectordesignerplugin.cpp
--    skgcalculatoreditdesignerplugin.cpp
--    skggraphicsviewdesignerplugin.cpp
--    skgshowdesignerplugin.cpp
--    skgtablewithgraphdesignerplugin.cpp
--    skgdateeditdesignerplugin.cpp
--    skgprogressbardesignerplugin.cpp
--    skgperiodeditdesignerplugin.cpp
--    skgsimpleperiodeditdesignerplugin.cpp
- )
- 
-+IF(SKG_DESIGNER)
-+    SET(skgbasegui_SRCS ${skgbasegui_SRCS}
-+        skgwidgetcollectiondesignerplugin.cpp
-+        skgtabwidgetdesignerplugin.cpp
-+        skgtablewidgetdesignerplugin.cpp
-+        skgtableviewdesignerplugin.cpp
-+        skgfilteredtableviewdesignerplugin.cpp
-+        skgtreeviewdesignerplugin.cpp
-+        skgcomboboxdesignerplugin.cpp
-+        skgcolorbuttondesignerplugin.cpp
-+        skgwidgetselectordesignerplugin.cpp
-+        skgwebviewdesignerplugin.cpp
-+        skgzoomselectordesignerplugin.cpp
-+        skgcalculatoreditdesignerplugin.cpp
-+        skggraphicsviewdesignerplugin.cpp
-+        skgshowdesignerplugin.cpp
-+        skgtablewithgraphdesignerplugin.cpp
-+        skgdateeditdesignerplugin.cpp
-+        skgprogressbardesignerplugin.cpp
-+        skgperiodeditdesignerplugin.cpp
-+        skgsimpleperiodeditdesignerplugin.cpp
-+    )
-+ENDIF()
-+
- SET(LIBS KF5::Parts KF5::KIOFileWidgets KF5::NotifyConfig KF5::Notifications Qt5::QuickWidgets Qt5::PrintSupport Qt5::Svg skgbasemodeler)
- IF(SKG_DESIGNER)
-     SET(LIBS ${LIBS} Qt5::Designer)
--- 
-2.18.0
-
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 6afd808cbbb7..5156b3be98f4 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-office/skrooge/skrooge-2.16.2.ebuild b/app-office/skrooge/skrooge-2.16.2.ebuild
index 0dfef569c4e5..3b71b9d132f3 100644
--- a/app-office/skrooge/skrooge-2.16.2.ebuild
+++ b/app-office/skrooge/skrooge-2.16.2.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"
 
 COMMON_DEPEND="
diff --git a/app-office/skrooge/skrooge-2.15.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
index e4af19a2944e..adde622d056a 100644
--- a/app-office/skrooge/skrooge-2.15.0.ebuild
+++ b/app-office/skrooge/skrooge-2.17.0.ebuild
@@ -13,8 +13,8 @@ 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities designer kde ofx webkit"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -45,7 +45,6 @@ COMMON_DEPEND="
 	$(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(+)]
@@ -54,6 +53,8 @@ COMMON_DEPEND="
 	activities? ( $(add_frameworks_dep kactivities) )
 	kde? ( $(add_frameworks_dep krunner) )
 	ofx? ( dev-libs/libofx )
+	webkit? ( $(add_qt_dep qtwebkit) )
+	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kguiaddons)
@@ -69,6 +70,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!app-office/skrooge:4
+	$(add_qt_dep qtquickcontrols)
 "
 
 REQUIRED_USE="test? ( designer )"
@@ -76,8 +78,6 @@ REQUIRED_USE="test? ( designer )"
 # hangs + installs files
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-2.14.0-designer-optional.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)
@@ -85,6 +85,7 @@ src_configure() {
 		$(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