gentoo resync 08.09.2018

8 files changed, 114 insertions, 15 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 8f05ea021cc2..e0034cb4c5e7 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index dbb98ee06016..86d364859cd9 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -5,6 +5,6 @@ DIST gnucash-2.7.4.tar.bz2 13364512 BLAKE2B 0a552efe5a4f024517c054516eb25b51abb2
 DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274056bf10ef1721bce48ec18e4df4b488ce885dc767b4f1e951dabcdc2ba702cb5fe239f249ec50c8d2d1d12a434 SHA512 ef74cbf396096a71316e14500a5b4e57670f9e9c0c5d46f3afe051ccbae2e46a5f14edd8dd805dfb61276b934db286d48ae044160699df82689e2718ed2f7573
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-2.7.4-r1.ebuild 3952 BLAKE2B 011a368e9bf441c05aaaf3681ed666151ad7a68fb849c2ceca50079f47b91265f9ef10b2cf10367393f3df5243bd59e76c7a2362c3ff498c855058412112c977 SHA512 9cdf9f7b57fa0eda3d5d3d154b194bb869fc360fdac5049e327eedb9b27d91a2e4022a3388d1c372a6d84f337c7d1be96722603e05ac4028073e6a9b7baaadc2
-EBUILD gnucash-3.2-r1.ebuild 4034 BLAKE2B d18757f5fbdefb5a59535c5607ef49a2f821d39b56c8d17f584b8d342537a81206dab17c610935cbd8a70e58ede4bb1e334537e214302e75bf22c6f9d8dec19c SHA512 59456bc40b78511c5fd66903dad2a4a96b3a693d22866994cb3966c3d7024f0b9df581278282a547f9bbad32c9faacd56cb33cd4c789029e5757088924681335
+EBUILD gnucash-3.2-r2.ebuild 3964 BLAKE2B 8143c1d294c5b5df4cf83f0901919edbd44d2a22909cb09d9bccea15247c3e15ce050a8003f6845e00cf3cb74291f32e8c26700f851407ccbd5a83a5435d862e SHA512 3779398d4db88d1a8263fa4ffa44ca399b79e43fa0d956bedac9945d33bb90f2dc1fecca88c4321bfe1b5f43702cb8e2b49cdb007aea4756a3883099416c785b
 EBUILD gnucash-3.2.ebuild 3888 BLAKE2B 7c7f0231e94ea7c430c2007968e70cd69c74dbb804f4b8e9858eafffc29e05ad8e2a1528b902294c75115161466ae2558e1149fc8c98a2376bf3f609e742e794 SHA512 b767881302588a21edc469ca1ed91a47a4560a756e099914c23a5907c78b1b9cd615831c3024c1c6f00a4c444b7c1c03d7417e1b9d90aa967c2196ab09d22b06
 MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/gnucash-3.2-r1.ebuild b/app-office/gnucash/gnucash-3.2-r2.ebuild
index 64b817987f96..52fda92ce402 100644
--- a/app-office/gnucash/gnucash-3.2-r1.ebuild
+++ b/app-office/gnucash/gnucash-3.2-r2.ebuild
@@ -32,11 +32,6 @@ RDEPEND="
 	>=dev-libs/libxml2-2.7.0:2
 	>=sys-libs/zlib-1.1.4
 	>=dev-scheme/guile-2.0.0:12=[regex]
-	gui? (
-	  gnome-base/dconf
-	  net-libs/webkit-gtk:4=
-	  >=x11-libs/gtk+-3.14.0:3
-	  )
 	dev-libs/boost:=[icu,nls]
 	dev-libs/icu:=
 	dev-libs/libxslt
@@ -46,6 +41,11 @@ RDEPEND="
 		chipcard? ( sys-libs/libchipcard )
 	)
 	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	gui? (
+	  gnome-base/dconf
+	  net-libs/webkit-gtk:4=
+	  >=x11-libs/gtk+-3.14.0:3
+	)
 	mysql? (
 		dev-db/libdbi
 		dev-db/libdbi-drivers[mysql]
@@ -72,7 +72,6 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.19.6
 	dev-lang/perl
 	dev-perl/XML-Parser
-	gui? ( gnome-base/gnome-common )
 	sys-devel/libtool
 	virtual/pkgconfig
 "
@@ -82,16 +81,13 @@ PDEPEND="doc? (
 	gnome-extra/yelp
 )"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	xdg_environment_reset
 }
 
-src_prepare() {
-	use gui || eapply "${FILESDIR}"/${PN}-3.2-no-gui.patch
-	default
-}
-
 src_configure() {
 	local sql_on_off="OFF"
 	if use mysql || use postgres || use sqlite ; then
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index c022124bfacf..9a1c030fda89 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,6 +5,6 @@ DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c81
 DIST scribus-1.5.4-poppler-0.64.0.patch.tar.xz 3020 BLAKE2B 3388efe6498545ffef6604a41b9e697a0cb6cd053c4893f9d64349bb2251400aca7a4f7dd193eb94cf69ca3f4ae1a3ba3ed106127c4fa680f396940d8056e669 SHA512 4577b4b737948a2b41dc0cec90ec95ba260959343e4953929696ceab518a2723a28a891b189caf79435e7fc8f8fc0a1012e7079e890d10549cb2ba426d15b568
 DIST scribus-1.5.4.tar.xz 72832248 BLAKE2B 64797e865ce44fb01f1e29823e3cb46b2b8f1501e8d07e8b265e93a37961582ec4118d0f32d460bc044e32cf7fa6069732f6b9ce60e4dc4b0b42f914b280e637 SHA512 7875ea5f3db5fb116856cf4cf56b4cce2d0b00d9c4820969f52b89e9bf2b36f96eb9e15b368d392be74d4c6d32e971fc28f6ecbf6661fce5e3b9cb61c4d02403
 EBUILD scribus-1.5.3-r1.ebuild 7114 BLAKE2B 6007bc6d4f797fef14bbf2eafa9f31fb6669d1d9218c5c572537d3f561368765e86fbb7b5a2629de84c25e9c2d5369d16cf02f10a7e0d719d473cf5bdc3f0b19 SHA512 3f9f2698b8ffbc68534252602bcb05452ed0101a12b62387f31d2ea9d4da0de4311359411935c6993e53414ebad38d3128ba242b446437de3e146255f1bd6933
-EBUILD scribus-1.5.4.ebuild 7080 BLAKE2B 21de836798dc4237e1820d6f1f88b625618b5eec2ca0b32dae6bd54581256ed2bb95042ed53f5e2ba1cf1fa3af376348c80cc0be81b93f20da0de9ccc79cc3d3 SHA512 696f855fa7b00633d62a722b68b0b0f5b20360bd79a973c5bd50ea3e1111de1dc6c2fc6354187312db28eea9be635e58e9207f82e12761d1f28316219de167b0
+EBUILD scribus-1.5.4.ebuild 7087 BLAKE2B c4a867e61b48a6eea3a56a3071f46d58be50ad95b9a5940b8022ed33cbb8bccb9a9ce2b761114fc0b023b4d3ea152f29f2185ef4e7bf767563e21c6fbe0e0747 SHA512 05206a6047b0c555d996697fb3de7bf5078ddca01f603aa40c5b98026c2f160521d52f07794e914dd31c234d6cf96c679629c1c0cbbcf22fc2353d6ee63d4c25
 EBUILD scribus-9999.ebuild 6770 BLAKE2B b6c97500b940fc8535bf729e0dd53f1f83e119a567d6ebd84354855d9701a185ce0e0393a67729aa14e682fe3ffc4cd72786e3b7becfd8ba0b2160910683c127 SHA512 06aa425130bdf6540d0c2f07bff00b8a639c74790faaecd3c3af3e7714220821be0312e162248b6d748abea48e965ee29deedd230cb18eb9d84e38b1b670f105
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.4.ebuild b/app-office/scribus/scribus-1.5.4.ebuild
index 2802775877ca..6f8452488379 100644
--- a/app-office/scribus/scribus-1.5.4.ebuild
+++ b/app-office/scribus/scribus-1.5.4.ebuild
@@ -16,7 +16,7 @@ https://dev.gentoo.org/~asturm/distfiles/${P}-poppler-0.64.0.patch.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 ~sparc x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
 
 #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
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)