gentoo resync 08.09.2018

3 files changed, 104 insertions, 1 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 39928a26d221..c4b56b148ddf 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,6 @@
+AUX skrooge-2.14.0-designer-optional.patch 3425 BLAKE2B 735941612ef1e99db255a23cdc00fd83a05b901c742a30e211f73296fcb05149cb620e510f795e236a6abaaade1fe5898d149863e125afaa1da392cc3f074eca SHA512 872e3d824a812c7fe75b61cfdae25910ecd5562304b023035b3f3c208b32144435f109c207a8cb2dd56fdf49abedb730fa00029d388a196eab63751c5f2376ec
 DIST skrooge-2.13.0.tar.xz 20432856 BLAKE2B 5e5ace28f0a3d0f60decb8bcb63fde3d9ed5dc79103ce8d2f4bad2be33b3e4896f19aac4954668bee194362b3b860f0e585e902ed54563b0a82ee36ab41263a7 SHA512 7c5543a4c26953c89a1a67b653bdf5fa7f4baa14d96e763d868f27b288a0f9d7d4bc2994436a4e749d4fd7db999c16b6fcee69817be0774c6e171e49d69e30ba
 DIST skrooge-2.14.0.tar.xz 21659440 BLAKE2B 2b90a5a34d06d916aed4e1d2622c624bdc30c6b947f812f5f227e7ef0198eeada4bb1c37be92a2cc07908635ce1fc7fc749e8b8f7444f9a448ab86602754f9bc SHA512 0446a8863120ecb3c8da4b03c2bf78d2a4e69b968a44d4084c234e369a2c91f63ea468738d00469a9a772855be9f224123a1816ad649171fbd6b780c6c05f62d
 EBUILD skrooge-2.13.0.ebuild 2365 BLAKE2B aeaf4ffdc815569d4c124bff99bc47acd7b49b576e761e981073a86e0c2e24275696dfcbc4ca2105e3c6fa0b52149130d0a21d9910750ed15e50f9a1b99bb2c6 SHA512 fd9c100ebf80952bb209597e369ca03f88e0a122ec4fb7271ed551c72016e360e49f87f5abff85018eed0a42cf03b39806d1ecb5b973526e95e9443c255b44e8
-EBUILD skrooge-2.14.0.ebuild 2367 BLAKE2B e4045cba2290bad7f903e9ff81615f7f5f443a0c3dd42ec82a6e1e43e7e9ef421737fa06a799d76c63e1801ea2ce43cfb74fb5b1dc959ae6cf1cc96125ec2773 SHA512 9e2ceacaa2ae8e16864cf3fe4de6dea5d261ad24f42af0e6499b7f1be88afabc3c40ee178de0ff12eb8c70ac1d1d58d73d912d55ea785d2f4739dab35e1bce5c
+EBUILD skrooge-2.14.0.ebuild 2423 BLAKE2B abef734e68c497063932313f804c23611ce2a67f36f82a85c1dc761e102dfa5a40775338966da99621828262a779328ce88c360bcbe6fa05828fefe6bc449f79 SHA512 0af434257c8726f013fd0e28081bd1e825f6b7b19771339ea904717a98f9e6af9057ed9bc97c49e0edbd32aed7f7a9ff6c36a39af007b36ae2dab560a4805a32
 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
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
new file mode 100644
index 000000000000..e34e80b78af1
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.14.0-designer-optional.patch
@@ -0,0 +1,100 @@
+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/skrooge-2.14.0.ebuild b/app-office/skrooge/skrooge-2.14.0.ebuild
index f5110fcfb096..69bfd2e405ca 100644
--- a/app-office/skrooge/skrooge-2.14.0.ebuild
+++ b/app-office/skrooge/skrooge-2.14.0.ebuild
@@ -76,6 +76,8 @@ REQUIRED_USE="test? ( designer )"
 # hangs + installs files
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-designer-optional.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)