gentoo resync : 18.03.2018

14 files changed, 158 insertions, 241 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 81bdce719eef..766d75c3ba7b 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 7c9d351f608f..7b3410a70f39 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,8 +1,9 @@
 AUX calligra-3.0.0-no-arch-detection.patch 408 BLAKE2B adff8aade0b9718692e84d8ab407caa3b8b8d279609fefd3daafa0617421bb18dee4ba41374aa0eed5e41e766e7a856e7f82dbec7ac7b4985d7e133fdf4eaed9 SHA512 91e1f5a760f118c3f7abdba1409c8c119265bcf43eef405ec0fdeb7b5b4fd7c0c7e38166acebe4b1766fe276015eb12e6a62743f3d8d648c20856e25c9231557
+AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72
 AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d
 DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
 EBUILD calligra-3.0.1.ebuild 6814 BLAKE2B 62e0cb77ebdbafc0d4dcf5e4e298122f84087dd895d9182b212ff4f040e62b04f52722860cdadf247880b9688d202985ef43b72f59841a2b79c73befb9c69924 SHA512 9fb02a5ab71bdfd24fe1588576fe1f9fbef96e4e3885e11d6a649cee6e44551c36430ae2f4c0693e9de4e5ddf5186713106a56f0b8e4df1efe61bd7711ad7adb
-EBUILD calligra-3.1.0-r1.ebuild 6638 BLAKE2B 0d1df11b3054975c90a07fa8b79eee25c712db1eb1fe01d74b1e8706a7ef658076cb104555e1f202d8dea9b6dfa8073b039864d0692928d3fc78a56df0ce5706 SHA512 2de362cb860f96377b791f3a560c6b38611201983bcf8a1be925a05d3d9338843e69c318a76a702c80ad44a5c9d465f7455d9c4d51e0b0b692a0022982798a44
+EBUILD calligra-3.1.0-r2.ebuild 6721 BLAKE2B af410cfa24b444cb0c6f438f43297bbddd6daf25cb0f0897f535f41f18abff0fd8ddb49fdac594965da991d495e910029e3fb44c63eade47abf05986aa1011da SHA512 94de4d10a6a84f8c208f7cea72f6d8e7d4cbfec060ae27d179798264be62c3ccb3465e20a440798f35c04f41cab942a3360b9cb32ee6b5c645e38b2f95ef0edd
 MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
diff --git a/app-office/calligra/calligra-3.1.0-r1.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild
index d0f98bb0a470..4c861b1050f8 100644
--- a/app-office/calligra/calligra-3.1.0-r1.ebuild
+++ b/app-office/calligra/calligra-3.1.0-r2.ebuild
@@ -5,6 +5,7 @@ EAPI=6
 
 CHECKREQS_DISK_BUILD="4G"
 KDE_APPS_MINIMAL="17.12.0"
+KDE_DOC_DIR="xxx" # contains no language subdirs
 KDE_HANDBOOK="forceoptional"
 KDE_PO_DIRS="po plan/po"
 KDE_TEST="forceoptional"
@@ -78,7 +79,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	virtual/libiconv
 	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( app-crypt/qca:2[qt5] )
+	crypt? ( app-crypt/qca:2[qt5(+)] )
 	fontconfig? ( media-libs/fontconfig )
 	gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
 	gsl? ( sci-libs/gsl )
@@ -137,7 +138,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}"/${P}-no-arch-detection.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-no-arch-detection.patch
+	"${FILESDIR}"/${P}-doc.patch
+)
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
diff --git a/app-office/calligra/files/calligra-3.1.0-doc.patch b/app-office/calligra/files/calligra-3.1.0-doc.patch
new file mode 100644
index 000000000000..ad150edbf8a4
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.0-doc.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt	2018-03-15 16:59:36.624682111 +0100
++++ b/CMakeLists.txt	2018-03-15 17:07:02.306267220 +0100
+@@ -1160,9 +1160,7 @@
+   add_subdirectory(braindump)
+ endif()
+ 
+-if(SHOULD_BUILD_DOC)
+-    add_subdirectory(doc)
+-endif()
++add_subdirectory(doc)
+ 
+ if(SHOULD_BUILD_PART_QTQUICK)
+     add_subdirectory(qtquick)
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 09c46d20c9d4..c674ad28ff81 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -1,5 +1,7 @@
+DIST alkimia-7.0.1.tar.xz 38400 BLAKE2B c6dccf0702ae42bfcebfa20fc34233766ab4b08c81d7b8aa8af2be2003560f2e088e922a0ec5656c6f8e34d3f3a8348fb6315c3e5aecf72cda9fa2506e1a2161 SHA512 7f72eaf69ad38c5478498a212f6f644ab76a27aec588ff8817414c7e36190568012cd2faff7ae31978beec670539ac93e55f3637a331e90738bddc11a423138c
 DIST alkimia-7.0.tar.xz 37992 BLAKE2B 998ab4c560edf1f327369fd49e56687e35d672490fe367afbddaca5e0e8a2980213825bdeddd41e1dc37dfb825c1fc4b997e4c7c4e787ca2c819f5d0333f4688 SHA512 0d84616d6b593cba76caee4875f2cda209a4c5f3727abb9a6902faecd46dad4f4a19c099fe3c4677bf9abf540dbd5a76eacf8bb761fac3a3aee9723601064e1e
 DIST libalkimia-5.0.0.tar.xz 28400 BLAKE2B 68fa555b1e42bcadcf7aa229092e8a2d6500f4e5d03720dd259eec43daeb7f2916564500d1d2b32c0b36988a8907120404830880a7d10999c3c6b9d010903f61 SHA512 9ba205f5726f237389b9ea928ef37fc3b38161aaec5988dcc64afa3d8e53575a055b248e3c27e738db13f9e6af231f493e1374bbc50d0672729b0cdb391ce99f
 EBUILD libalkimia-5.0.0.ebuild 545 BLAKE2B 2c1264a998140dfe45f7134d43a00c99f11aaf6f8cb9715f78ffa6d5a88d0ea7f40e97b559f626e5a43c8493c14e9237e5c8350a50c624071e977b22d5ca1541 SHA512 cfbf2fa200b38a4b528421e09a3bf6da404e35cf8d5d79cbdbb81ae6f99d3bfe22a0e4bc9270417ce7dfc681ae1bc3cac0cfc05fe2c8940c7ce9f0a54132b02d
+EBUILD libalkimia-7.0.1.ebuild 718 BLAKE2B a685ac8ec2ee5b01ca49212b8aecf9f54f6a6231dba76757d52613fba640ef16c79437029554a200e10b17ead8e32e0cfd6a429f7292b682af8a53eaabe9f008 SHA512 b6c545a93418a51ce07917a63db5131a82376c2f533af100f5d0092ed6636f86aeb6450970359d25aa97b7b93f64cdd7c06828fdf8fa3d849f1438c6f7e2a3cb
 EBUILD libalkimia-7.0.ebuild 718 BLAKE2B a685ac8ec2ee5b01ca49212b8aecf9f54f6a6231dba76757d52613fba640ef16c79437029554a200e10b17ead8e32e0cfd6a429f7292b682af8a53eaabe9f008 SHA512 b6c545a93418a51ce07917a63db5131a82376c2f533af100f5d0092ed6636f86aeb6450970359d25aa97b7b93f64cdd7c06828fdf8fa3d849f1438c6f7e2a3cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-office/libalkimia/libalkimia-7.0.1.ebuild b/app-office/libalkimia/libalkimia-7.0.1.ebuild
new file mode 100644
index 000000000000..369d414c124c
--- /dev/null
+++ b/app-office/libalkimia/libalkimia-7.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+KMNAME="alkimia"
+inherit kde5
+
+DESCRIPTION="Library with common classes and functionality used by KDE finance applications"
+HOMEPAGE="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
+SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/src/${KMNAME}-${PV}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/7"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	$(add_qt_dep qtdbus)
+	dev-libs/gmp:0=[cxx]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package doc Doxygen)
+	)
+	kde5_src_configure
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6c03fa093c69..a6085107147c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,6 +18,6 @@ DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce
 DIST libreoffice-help-6.0.2.1.tar.xz 2994936 BLAKE2B 69660e50ac871aa890cb5567ac1ebdf4ea9a7ff724b0f86bb44cf29dd475fc35bc9192068a5a8cbaebd1b11042a14d55fa39ecd270e2b0737ed57fe13621d599 SHA512 1e0b3a22bfa36288538cdb420780fe7c0eca59482606f36aa197dd5c0eed1c81d6214e872a3c1b968306300888e959f2d66deded6f491b2c4585164806b06b27
 EBUILD libreoffice-5.4.5.1.ebuild 17452 BLAKE2B 8086f686812755e1166afd3b1fcba1963815423f8f6919a6e0b769edd2d527be103204309d5e2d451ca3cbf92e1e7e7817188a2cadfa9d29daf20f3371248d81 SHA512 cb41bdce635bd4d6a291bb2618e9264cfa4430c6113be9c41936386d1b296bc4c668165b39df4183a4483a438b7cbcd3988ce2e0e63326d1aca702ca5c51f6d7
 EBUILD libreoffice-6.0.2.1.ebuild 16675 BLAKE2B 513ded64b7d65310733b5f638505e02873f73c16705589813a2e45ad89e083f5c4457cebffbbca15f2c6e5d164d77890d3eb912fba16b816d2d33e8a0f300ef3 SHA512 3982d6ce04fab30f13a2625f7c9cec941855667489e669ea1d6623233b9d369aa014afad7b7c85eb888e3e31165be202c8cdc1d7e4c80980a75532dd41ded618
-EBUILD libreoffice-6.0.9999.ebuild 16675 BLAKE2B 513ded64b7d65310733b5f638505e02873f73c16705589813a2e45ad89e083f5c4457cebffbbca15f2c6e5d164d77890d3eb912fba16b816d2d33e8a0f300ef3 SHA512 3982d6ce04fab30f13a2625f7c9cec941855667489e669ea1d6623233b9d369aa014afad7b7c85eb888e3e31165be202c8cdc1d7e4c80980a75532dd41ded618
-EBUILD libreoffice-9999.ebuild 16577 BLAKE2B 73117bb96912763f023be3aaabd418c01c270d358e84e4558d3f116508805410f1ddc0f67220327ef7b87b3846637fc8f94299955e37caed2f33489783a651b6 SHA512 07fd7e5ebe3470ae014a1fd31b3c436472e9dcd9332fbc87bdbd559e0c5cb1129d814d4d2e99ec97de7543f8bad43cd586c89e060c7fb60c7f7824ceb74f20ce
+EBUILD libreoffice-6.0.9999.ebuild 16675 BLAKE2B 8b3642de5bbf88987ab23528efedf7610c8d718c48e9f37234069eeedf9543ba7ecc1caf4421e16bf018fb7e4ed3d58be424c3e37c2eb80149b6d88544584d5b SHA512 dced5e96f05cee9a9eef593e32e2cfcbd1ab7950b6208832b2be0c39ed414128977ac3d0f4874232b15e364f5fcf99fda704e3e70bb43a127178a91bd818ba82
+EBUILD libreoffice-9999.ebuild 16577 BLAKE2B 3c668c2fb1b0c1fa3eada6a5dee2f64b16255a5257d1eadef80618d966eefe35c0c3de2fca3b99c185588ad6edf9d06c381af020891b1bc2bcb0911dbf90c59d SHA512 de026093ccbc4bc74d6b6e189db870bc4f2f4ccc2b769df25bcf396064bd68785bcc748717ad8e69711c4ef25022ef419acdc46ac916830bc5cbb7b00e1ed49f
 MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index b5671c6317c8..4b468aa1e1ec 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -185,7 +185,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-fonts/libertine
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
 	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/oxygen-icons:* )
+	kde? ( kde-frameworks/breeze-icons:* )
 	vlc? ( media-video/vlc )
 "
 
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index ec4bf5552b68..f59d7ee1c8a6 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -184,7 +184,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-fonts/libertine
 	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
 	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/oxygen-icons:* )
+	kde? ( kde-frameworks/breeze-icons:* )
 	vlc? ( media-video/vlc )
 "
 
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 0c50cb87498f..12903297b21f 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,4 +1,3 @@
-AUX scribus-1.4.0-minizip.patch 1891 BLAKE2B 407d5a46210573f511572ef3dd3e25f7b23a7a83b86e48878df9b71c4669a53a6bb8df80de51e42049dc363a14e4246d11c67c046bcebb85748db78300be14cb SHA512 99feefb8e4ba9ae903e6a7a68b4cd497572ef254b550c864135e20392902e3595ea4414916474d5e80ceabc66e6cc5fac09af41955cbb2ba8e8d41480009bd86
 AUX scribus-1.5.3-cmake-openssl.patch 737 BLAKE2B 276d3ad6804506ef4d4c041ce1e0bbf943fe4325e933c9d56401690d1bbd38317898dd5ab00311ee3dd92a873255f615a6b8c415d3c7a6878ce0469ac2a24853 SHA512 63ef4eaa68aad8811150e4208842e602640a7e2e034d2923b79318ca1bcb433829daf7fb6b33fcd22d3e2e9f4103c5f7c6d76883970307ea280c0bfd6df80d61
 AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
@@ -6,9 +5,7 @@ AUX scribus-1.5.3-poppler-0.58.patch 17057 BLAKE2B 87a0e55baa398ed412b48cb5c4d3c
 AUX scribus-1.5.3-x86-fpic.patch 759 BLAKE2B 0abaed6521042c9398ea12075ffe88f3ec47b2f020a7040beb7312dfbb298e733b380935d5676102df7b04512f866bea2fb67fc9135cc741db208ad4b451176a SHA512 8b843098e31be3ad07ed82225a6b9bb7e46ae29b369508cdea6f092142d27071908c510ccbfe11b778d970e0b3a5bf14277e0124c781ba0f8bc230716a9c03e0
 AUX scribus-9999-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
 AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
-DIST scribus-1.4.6.tar.xz 73601104 BLAKE2B 5968a48410d1a2a4caa333c9f83b43f68c964862d9aa3cb20e136760201ef2ef6cb82f770026b6f962758c9d397f25a017d906433f52f88bec11c57105c27f6b SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
-EBUILD scribus-1.4.6.ebuild 4501 BLAKE2B b30fa6004319b54965b5b61f9cc466535135a8dd78434b090ff827df779ec003af1cf9ed00903d1614b6102be34298a95a1c3c609b1c5ec7a707b09b42bfe393 SHA512 0ede0bf314d6aea40da9316ea1778b9e2810780d715fe5fb66221354467147c54694b3b6f620faa7da6ad386034cb4b8b03df9acb3cd372b17ecc4415543531b
 EBUILD scribus-1.5.3-r1.ebuild 7023 BLAKE2B fb1027454b96b4900ace6c0e859c15a5adb8e5e7be234a0164f7b513bca16ac7ada72fd66b93d484f57864536dec6266a6d2ab6d7c9b918d763b712300493a60 SHA512 fc814f7d0c88edb24f91326ad93f4034e0f39c1f5396c315bef6cec7b3de69c08e9867abba05f4241711d23daaee8656f74e0c77a9d60dfdec557542774821e5
 EBUILD scribus-9999.ebuild 6947 BLAKE2B 98d7eacf3fe442b1539519139e9a127a3d7c0ea7fa5b9e75c6b7b220353ce7635c97675df9f2df1f272116c44f6825817e8c62fff75860d4cfeb75bc4fa388f8 SHA512 fd3911b80f04485f8fc11f2b30bc3f3e1ced644217b6e1d00716e48a68154b5b12102267e363b39dcaeaff129eb46b246f415c581f724951f45b3a9e174355af
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-1.4.0-minizip.patch b/app-office/scribus/files/scribus-1.4.0-minizip.patch
deleted file mode 100644
index c0a4b7cb38eb..000000000000
--- a/app-office/scribus/files/scribus-1.4.0-minizip.patch
+++ /dev/null
@@ -1,60 +0,0 @@
- Scribus.pro            |    4 ----
- scribus/CMakeLists.txt |    2 --
- 2 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/Scribus.pro b/Scribus.pro
-index 17b5417..0cc23c9 100644
---- a/Scribus.pro
-+++ b/Scribus.pro
-@@ -276,7 +276,6 @@ HEADERS += scribus/about.h \
-            scribus/insertaframe.h \
-            scribus/insertTable.h \
-            scribus/inspage.h \
--           scribus/ioapi.h \
-            scribus/javadocs.h \
-            scribus/KarbonCurveFit.h \
-            scribus/langmgr.h \
-@@ -496,7 +495,6 @@ HEADERS += scribus/about.h \
-            scribus/undostate.h \
-            scribus/unicodesearch.h \
-            scribus/units.h \
--           scribus/unzip.h \
-            scribus/updatemanager.h \
-            scribus/upgradechecker.h \
-            scribus/urllauncher.h \
-@@ -933,7 +931,6 @@ SOURCES += scribus/about.cpp \
-            scribus/insertaframe.cpp \
-            scribus/insertTable.cpp \
-            scribus/inspage.cpp \
--           scribus/ioapi.c \
-            scribus/javadocs.cpp \
-            scribus/KarbonCurveFit.cpp \
-            scribus/langmgr.cpp \
-@@ -1143,7 +1140,6 @@ SOURCES += scribus/about.cpp \
-            scribus/undostate.cpp \
-            scribus/unicodesearch.cpp \
-            scribus/units.cpp \
--           scribus/unzip.c \
-            scribus/updatemanager.cpp \
-            scribus/upgradechecker.cpp \
-            scribus/urllauncher.cpp \
-diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt
-index dcd7e10..3aca69b 100644
---- a/scribus/CMakeLists.txt
-+++ b/scribus/CMakeLists.txt
-@@ -405,7 +405,6 @@ SET(SCRIBUS_SOURCES
-   insertTable.cpp
-   insertaframe.cpp
-   inspage.cpp
--  ioapi.c
-   javadocs.cpp
-   KarbonCurveFit.cpp
-   langmgr.cpp
-@@ -613,7 +612,6 @@ SET(SCRIBUS_SOURCES
-   undostate.cpp
-   unicodesearch.cpp
-   units.cpp
--  unzip.c
-   updatemanager.cpp
-   upgradechecker.cpp
-   urllauncher.cpp
diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild
deleted file mode 100644
index 090843846790..000000000000
--- a/app-office/scribus/scribus-1.4.6.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit cmake-utils fdo-mime python-single-r1
-
-DESCRIPTION="Desktop publishing (DTP) and layout program"
-HOMEPAGE="http://www.scribus.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
-
-# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}
-# Keep this sorted, otherwise eliminating of duplicates below won't work
-IUSE_L10N=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW"
-
-map_lang() {
-	local lang=${1/_/-}
-	case $1 in
-		# Retain the following, which have a specific subtag
-		de_*|en_*|pt_*|zh_*) ;;
-		# Consider all other xx_XX as duplicates of the generic xx tag
-		*_*) lang=${1%%_*} ;;
-	esac
-	echo ${lang}
-}
-
-prev_l=
-for l in ${IUSE_L10N}; do
-	l=$(map_lang ${l})
-	[[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}"
-	prev_l=${l}
-done
-unset l prev_l
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	tk? ( scripts )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/boost
-	dev-libs/hyphen
-	dev-libs/libxml2
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0
-	media-libs/tiff:0
-	net-print/cups
-	sys-libs/zlib[minizip]
-	virtual/jpeg:0=
-	cairo? ( x11-libs/cairo[X,svg] )
-	!cairo? ( media-libs/libart_lgpl )
-	hunspell? ( app-text/hunspell )
-	pdf? ( app-text/podofo )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-	tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/ghostscript-gpl"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-minizip.patch
-	)
-
-src_prepare() {
-	cat > cmake/modules/FindZLIB.cmake <<- EOF
-	find_package(PkgConfig)
-	pkg_check_modules(ZLIB minizip zlib)
-	SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
-	SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
-	MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
-	EOF
-
-	rm scribus/{ioapi,unzip}.[ch] || die
-
-	sed \
-		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-		-i resources/templates/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local _lang lang langs
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		if use l10n_${lang}; then
-			langs+=",${_lang}"
-		else
-			sed -e "/${_lang}/d" -i scribus/doc/CMakeLists.txt || die
-		fi
-	done
-
-	local mycmakeargs=(
-		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DWANT_NORPATH=ON
-		-DWANT_QT3SUPPORT=OFF
-		-IUSE_LINGUAS=ON
-		-DWANT_GUI_LANG=${langs#,}
-		-DCMAKE_INSTALL_DATAROOTDIR="${EPREFIX}/usr/share"
-		-DTAG_VERSION=-${PVR}
-		$(cmake-utils_use_with pdf PODOFO)
-		$(cmake-utils_use_want cairo)
-		$(cmake-utils_use_want !cairo QTARTHUR)
-		$(cmake-utils_use_want debug DEBUG)
-		$(cmake-utils_use_want minimal NOHEADERINSTALL)
-		$(cmake-utils_use_want hunspell HUNSPELL)
-		$(cmake-utils_use_want !examples NOEXAMPLES)
-		$(cmake-utils_use_want !templates NOTEMPLATES)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local _lang lang file
-	for _lang in ${IUSE_L10N}; do
-		lang=$(map_lang ${_lang})
-		file="${ED}"/usr/share/scribus/translations/scribus.${_lang}.qm
-		if ! use l10n_${lang} && [[ -f "${file}" ]]; then
-			rm "${file}" || die
-		fi
-	done
-
-	if ! use scripts; then
-		rm "${ED}"/usr/share/${PF}/scripts/*.py || die
-	else
-		if ! use tk; then
-			rm "${ED}"/usr/share/${PF}/scripts/{FontSample,CalendarWizard}.py* || die
-		fi
-		python_fix_shebang "${ED}"/usr/share/${PF}/scripts
-		python_optimize "${ED}"/usr/share/${PF}/scripts
-	fi
-
-	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
-	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-	cat >> "${T}"/COPYING <<- EOF
-	${PN} is licensed under the "${LICENSE}".
-	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
-	EOF
-	dodoc "${T}"/COPYING
-	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
-	doicon resources/icons/scribus.png
-	domenu scribus.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 1d30d32085b1..fe908dd102c8 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,5 @@
 DIST skrooge-2.11.0.tar.xz 20677024 BLAKE2B d8995746a64489cf9b6c824c8d6349f2ef10a57fcc086c97db0ce1b65e31f72fa4c41994b4dd4ab85df008e2721bd84a029a9f71ea219d6203856e314895e2ef SHA512 088ef94d2eaa866a1cf3f55ed960bccf27a80e3a1138855b35fa301c799468b0d0594a03310872a9b3ce2513d1ac9a8df3fa039636517f7b2b135fda65a67e00
+DIST skrooge-2.12.0.tar.xz 20289828 BLAKE2B 999f100fffca3b8fff5e343b1137fc51e337428cdbd89f7e5eb72811e3e5e1522cc257e6be83aad57cf4ec66fefd061b685d94caaadcc27182f32da13d57014f SHA512 348262a7e86f6b3f9fa028fea324eeb73c96e03a77d16774ae9f4b554c1893aca7a002bcf3160d4055cfe8aaceeb76a364e71e7f605382cfe1a801eca1ca874f
 EBUILD skrooge-2.11.0.ebuild 2365 BLAKE2B aeaf4ffdc815569d4c124bff99bc47acd7b49b576e761e981073a86e0c2e24275696dfcbc4ca2105e3c6fa0b52149130d0a21d9910750ed15e50f9a1b99bb2c6 SHA512 fd9c100ebf80952bb209597e369ca03f88e0a122ec4fb7271ed551c72016e360e49f87f5abff85018eed0a42cf03b39806d1ecb5b973526e95e9443c255b44e8
+EBUILD skrooge-2.12.0.ebuild 2367 BLAKE2B e4045cba2290bad7f903e9ff81615f7f5f443a0c3dd42ec82a6e1e43e7e9ef421737fa06a799d76c63e1801ea2ce43cfb74fb5b1dc959ae6cf1cc96125ec2773 SHA512 9e2ceacaa2ae8e16864cf3fe4de6dea5d261ad24f42af0e6499b7f1be88afabc3c40ee178de0ff12eb8c70ac1d1d58d73d912d55ea785d2f4739dab35e1bce5c
 MISC metadata.xml 400 BLAKE2B b0f7a87e2c2fda05271f731d2c3a6d9a490cf94dd7a742ed60e21aa44964a50bad1218c6ebd9ad16d87a8814f34b70792f7d80bd1e03d80845bd9f1c9292a95c SHA512 50120cec8f5798f6b104c6e1fd05b831f2f280e2f3bab8aa66667a3da1bb351a955b671d16cf4e30b44b0738625424fe4a32bb8a677947d147031964e108dcb0
diff --git a/app-office/skrooge/skrooge-2.12.0.ebuild b/app-office/skrooge/skrooge-2.12.0.ebuild
new file mode 100644
index 000000000000..f5110fcfb096
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.12.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+}