gentoo resync : 08.06.2019

10 files changed, 391 insertions, 233 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 4b12eed7ad79..beefb6e3ce07 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index f3d9a1c2c04a..7d6881115a6e 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,3 @@
-DIST kmymoney-5.0.3.tar.xz 11690060 BLAKE2B beb836c4753caa81ee3a06f12fce65fd584fbeaa228cba087b77284e0f3ecce8b88b030466198db62fdf23af26cee5caad59eb845653006d700cf68a0793231f SHA512 9f8aaa26a3cb3f5eb2a61936ecc54f97096f98d4f0ffbfbfb6adbe099a559f797d997b1d23bb7f18d31d76182f8fa8601a70176a4bc16f5cdf2fac0af8903fc0
 DIST kmymoney-5.0.4.tar.xz 11708760 BLAKE2B 62fd279039ef41078fddfc4a69d9a8e7c425965114ad91464ef94f7e8f72f07ed9cc16989d1ed6ee01fdc8cdd274afb231fbfe43e8a5e0c8d17c33aa17fcb70b SHA512 406460f33b32941796e8b0a2fb21f783db6c2444b35b0402647e688b78ecccb82401a7a1fa7c008ffd840cbd88c82db91e367be917f9ab7b231a0208b439b91f
-EBUILD kmymoney-5.0.3.ebuild 3200 BLAKE2B a97e6f49841042928fdf88f3480540e05bc84dd18c833172a56d73df6b74eccc56b0f398326073f95226d4a2524813c957542055a4e195e4df06b0120f72407b SHA512 734e6756d2bca72650b87b7fa25ed9d82d3905d18aad0ed72a560b56b6653da36113626899de587f792cb59a46c8661e3476471e548ff26355e7dbeaf4f56b3e
-EBUILD kmymoney-5.0.4.ebuild 3161 BLAKE2B c108031005cd76da3c921fad1ac3d96bd86e992f0d700c55ff0ef989b90b3d840d1ccc69a5e228b6ff98bdec5452cf68a76b5252353e7e9563b573cf1da7bcde SHA512 adde5db52f0fc02a2cd0b044350cd65d6648b7226085dabc1150f36c1559874b6f7c115488dcb4056d840eefa71b5a91809077201fb4f26be16686593c5a927d
+EBUILD kmymoney-5.0.4.ebuild 3224 BLAKE2B 49d121d49979667fad2c537863da358a5ba61c008eb031afc9281a46b156c833477760dfd23050dcda73b45f4eaa00a296a34d829cf19958d12abd4d2508b044 SHA512 23f89a6494cb46a3690dc3d39e80ff8f56284c3cc4dcf02206a3265a2cae86f0dc10b0e5d17191ba8110c2884efa580262207c86518f0304af3e696e206b9d3f
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.3.ebuild b/app-office/kmymoney/kmymoney-5.0.3.ebuild
deleted file mode 100644
index 15c71b919146..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_BRANCH="5.0"
-PYTHON_COMPAT=( python2_7 )
-
-KDE_GCC_MINIMAL="6.4"
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde5 python-single-r1
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-6.0.0
-	dev-libs/gmp:0=
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	activities? ( $(add_frameworks_dep kactivities) )
-	addressbook? (
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep kcontacts)
-		$(add_kdeapps_dep kidentitymanagement)
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.6.5
-		>=sys-libs/gwenhywfar-4.15.3-r1[qt5]
-	)
-	holidays? ( $(add_frameworks_dep kholidays) )
-	ofx? ( dev-libs/libofx )
-	webkit? (
-		$(add_frameworks_dep kdewebkit)
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	)
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	weboob? (
-		${PYTHON_DEPS}
-		$(add_qt_dep qtconcurrent)
-		www-client/weboob[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-pkg_setup() {
-	use weboob && python_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package addressbook KF5Akonadi)
-		$(cmake-utils_use_find_package addressbook KF5Contacts)
-		$(cmake-utils_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_KBANKING=$(usex hbci)
-		-DENABLE_LIBICAL=$(usex calendar)
-		$(cmake-utils_use_find_package holidays KF5Holidays)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
-		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake-utils_use_find_package weboob PythonLibs)
-	)
-	kde5_src_configure
-}
-
-src_test() {
-	# bug: 652636
-	local myctestargs=(
-		-E "(reports-chart-test)"
-	)
-
-	kde5_src_test
-}
diff --git a/app-office/kmymoney/kmymoney-5.0.4.ebuild b/app-office/kmymoney/kmymoney-5.0.4.ebuild
index 9c92a22c0aec..f2f2db1d8a0d 100644
--- a/app-office/kmymoney/kmymoney-5.0.4.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.4.ebuild
@@ -18,7 +18,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
 
 REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
@@ -114,9 +114,9 @@ src_configure() {
 }
 
 src_test() {
-	# bug: 652636
+	# bug 652636; bug 673052: needs kmymoney installed to succeed
 	local myctestargs=(
-		-E "(reports-chart-test)"
+		-E "(reports-chart-test|qsqlcipher-test)"
 	)
 
 	kde5_src_test
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 0220e8714370..f25dd6ac4437 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,14 +1,27 @@
 DIST amd64-debug-libreoffice-6.1.5.2.tar.xz 1429362788 BLAKE2B 2973a7a336865fe26f7af3af930cb32be6df02bf80a8940e3bd40226b0341a2993d09e3d48bf3dfc9c5c1b679d194c143a1f298980c73349a93bd5515dfe7326 SHA512 b5ab3bd1bea5510a36ef630f11a0e6eebb923efa240394c24755e7f53abe939ddbdd0ff6beb635c94e48813e4cf70758e53fc1999250d0eb102063bed8ae4902
+DIST amd64-debug-libreoffice-6.2.4.2.tar.xz 1637546044 BLAKE2B 45e7b5e032c992906ec85b16a9bf4621637b5f9475df319c9d3a6d0630ef6ea97e7de2fe1e923727da8af2d3ebe1a6d28010d560ea2a877a7baf51a43794b2df SHA512 b7cbcf49143d6f5296469f27266a6329b8d9c54f9efb662a6a69891c6a3f1e707169813ae6a5468d5d84545336836e9b3d1ed06b51a9d574e9701ddc94b5e95f
 DIST amd64-debug-libreoffice-gnome-6.1.5.2.xd3 401159605 BLAKE2B 854a6d37cef9ce3464d1186cb45d0c608e080fbc0ff2ae63aba3503c0909d9ffff593e3633c00c95386ef2f15a8e17b6df6bfd271c021f13c7a184b1bc3a8893 SHA512 e3733c1e6ad127a3722fede1f36a28ce0ec12978a0bb8d49137d1f48da8462f18d5e1dd74998536efa548de28f7ffd57db8d6e47d965385c402aa82ec66810aa
+DIST amd64-debug-libreoffice-gnome-6.2.4.2.xd3 468745410 BLAKE2B e7b41740d4446d791c39851f1fe631c1166c722f5504c67b27a1da60fb5e02ece406c64ef27f1ef228e1df53b3d3603518dbdf5643a1aaff0f507aaf0b2a1d78 SHA512 65f79beb4e60713aa0b22d382ed3b3da5a905a1806ed11c86cc0c72cb1d07b16ea26c3228d91dae422ea720666863ee53a954d3e819b6ba5576375093f629cd1
 DIST amd64-debug-libreoffice-gnome-java-6.1.5.2.xd3 745666046 BLAKE2B 8cfa97632b1f2266208ed0980d88e0aed482f27d3000e7e6d3a7db67796a33caa7bbc604a2fbefb5433104bc1b72098e147d4d7982f8659f8356931b999fa47e SHA512 aa2b59209d272dba368cc931bebba0958071c829e6c53251b985b5f1d354dfd64c50d462d39de912c9f3378260a323d6a80c68674f12bfda24f13f39c6323250
+DIST amd64-debug-libreoffice-gnome-java-6.2.4.2.xd3 874137627 BLAKE2B 85738277be979d9af96c0c33005dca8abc0c42bb940f2b86ad8d3ad731efa38328103aa6069e0e3835c57761ce9703a16c2b7665975f1888a7132ee9a030ff90 SHA512 e598f3766c9febee1b3661f331cec88b4cf73f375614600a5b833a725b1eda9536dfd73cc761f0667328bb7ba3d203f22a63e5767f3d1e65fd3808ddc66bf61d
 DIST amd64-debug-libreoffice-java-6.1.5.2.xd3 734888893 BLAKE2B 1b8987c966139aca44ee9242022c717ce6618357567358cf8b2fdc6b8525afbd91b5a0dd9a0358f739f515e097b1e4160ac3dda5811c4e82fbd7868073d6f28f SHA512 a6cb9507d02cf212a0a30e2d8ea4d9650fdab7448480a4ac2c92369a144861fc2b47754c172663be2321257b81c2a9b41fa2373b9fc69f432893e02303eb3c55
+DIST amd64-debug-libreoffice-java-6.2.4.2.xd3 857444149 BLAKE2B d003dbed9e776d907264e4b5bb58a216c17833b5face6b42cfabbb5055a9c560a37e14babf880903710d029ddd5759596daccfadbf0fc0f81032d6175f4bff64 SHA512 d2206a50062bf48d1be7cbaf2cd74a2a0b76c410c7550c2db00dd3ff3784d41b3f3634fc6647e2221dee866465a6c060a8686e23e5c45d36b05a7362887fe91e
 DIST amd64-debug-libreoffice-kde-6.1.5.2.xd3 405230948 BLAKE2B f3dc189ad696ce47ba8681b1c3928c1dfebd70f59d3d4a845e69ab9d1427af3adb13a016648bcb15e7167d3ee4af3b74e0339592712573a53527790786d1d9cf SHA512 2505aea781253457c46a6b2fec4b999a35dc68ebfa5e25d930375b25287de040566ec12e2d199f0976d8da6a4f1aeff6d249f9af99e4ce4f80ee87885dd8ab96
+DIST amd64-debug-libreoffice-kde-6.2.4.2.xd3 482383176 BLAKE2B c3a08965bac7a52828bc5403cc3f08366d239886f49f65709e86a54d859812ba275c3e0ad1d8b5fe7d10b7a229207273daf341af0f014c9cfc9c9d1a04269d8a SHA512 151111f047b57194a5d1be1cd092dd1e8e28444fbaa9a1516941b7cac93c69187be21698a26fb8442c399f234b60c9c8b99ec0ffc1855c968d9eb0c687422705
 DIST amd64-debug-libreoffice-kde-java-6.1.5.2.xd3 749683586 BLAKE2B 43f6489ffe3446aeef20e9668fc4bee36003c8eca90d4b138983e05dc07333a4748d9d6d559f036b0c8de0a3ab184f3f02201a5e3442e1f5b93d40d39f437847 SHA512 4b32adaad6efd831aaf5887702d03f9b6baa851b1b98858c94e302b2133bd45bde4a382418b9ae05be0ac5bad827673dc46c381481550071848746e6d1eea59e
+DIST amd64-debug-libreoffice-kde-java-6.2.4.2.xd3 887769486 BLAKE2B 8914e9f23e6eae056df8afb00ffdd4990a982573b1fe5041fa37b3a40deb4c4edf1d56eb1a6f8134455e769f5a91f7da41b9105740a51c1ec3c104fc5f06b19d SHA512 021255fe383ea9470a233905daa48b2fcb1f13e1e05de625a370236a8003882d1030bbb417695e91257490e51943a6d04fbbce0d9b140468073c8ace5226e786
 DIST x86-debug-libreoffice-6.1.5.2.tar.xz 1395697556 BLAKE2B 337d2343a22f11f3f9993a5f50a9c5c202aeb830cce53114c3646e1e289549c7494d7de963bcb6851da130ef331f67fbf42657eaceb7e70e9f71fef273fba424 SHA512 9ee08d9df487c1f76bfdf2f51e465151c88039f18873ad2b8a7db3b8aafc6d370d61b3453843e0c30686e1c477e68f80c6050a61a6451b6b1327589c3f7fe156
+DIST x86-debug-libreoffice-6.2.4.2.tar.xz 1598638312 BLAKE2B 100d32663759aa0b2d3f0540179b267c80fbff43bb997775d2ec47a3b22fecf20c058aba91016469026a0a6aaa2df8348eb130694f1ca49fa31ede16a297eac1 SHA512 85173fc999d56acf1ad6dc7857b97f6c1a915e02bec6e603b79cda896f0d3b72d0c83e12e9d7ad1f13e5ffd7030f159cbe649590005fc8761566400401e7b003
 DIST x86-debug-libreoffice-gnome-6.1.5.2.xd3 389161539 BLAKE2B bf0b6352f6a4db9b24e176de87bfca548a2a3862111984da8fbd59b403fe6bfb63377e5b2be84f59a647bd2281a4ccb4db05f002dbb498c7743e6a1d6629dcbc SHA512 4332147743f5dbf246bc190fcd4a0be64064fc3e8755573b74af0cdbdc4147d82f23e1d2b1aabbc4fb23d80570a0ce492c7e7a5c2a53ae3d17229930cc9013ab
+DIST x86-debug-libreoffice-gnome-6.2.4.2.xd3 454784520 BLAKE2B 729059c75ec90f563148d7d10eb3bb0770ec2ad2ace2126fa3cbddb4e1043313015c62d6069de1750a8f8cc1bcec0dc754251bd6fb294b74299ebee69dc4028f SHA512 8d2dac20a46e56fb5fb6fc9973b7863346d79ea115caa7d9f502ba607573bf78fa07ae0948497c9c586d9c5c60f32a23b91c6955e98fc3be3e0eb3d2a8fc35a1
 DIST x86-debug-libreoffice-gnome-java-6.1.5.2.xd3 664204848 BLAKE2B 2ede572af0b5ae3143c7afed202112a1bfa608706171c45f3aabbe577c33352e6fd0a094756e60f04ad2f29520fafef64acd712052656b18d28bd40a05e7dac8 SHA512 9e8faf7735c550359e922899aa238bbb2d278edbe399e29491349be752c30bd358c198b7f3357b2eda97cc93b317e7c4ee4f9ae971d61ca8158d1d45cc36a2e4
+DIST x86-debug-libreoffice-gnome-java-6.2.4.2.xd3 797762116 BLAKE2B 3c62a50990b82cfc6f5e75ac823f02555736308b00889d52b61b0cb50005828d82b4c1a353dfaf7c3d848fdcf22f5871173fe8d6ef05f7983a65b2c7d79fca17 SHA512 ea43c19bef4d0ecff7be9ec956765135ea7545b37ca7c3b7403ba85959d4385e5960dcfd8299fae4f7a8b7e75ec07f51505ec82a1089b51174ce0cd0eac6dfec
 DIST x86-debug-libreoffice-java-6.1.5.2.xd3 653898049 BLAKE2B 44e8bb0f5221af7ac8099833042f1bb8714882335658a6c0006253f591052e4324aa7a3070bd0933d6af94ffd6e4737f6822b3962ce6b44e638ebb13bc1eeefd SHA512 26c041c551068c197dc1500853874a1c086e0e585058acb5c15936d7dd6cf0dbfac6f5b3bf67b03b84c395797308a4ea6767b80baf70d216ad253a182aa1790f
+DIST x86-debug-libreoffice-java-6.2.4.2.xd3 781613145 BLAKE2B 54c62d53e39ec447d5bd7c365377c7b2471d117878bf80c605d699423eb5ba4c80a43d2cfae3041dcb4f26192ad3c8d22792bdd951923827fe4edbe46c5b8651 SHA512 1978d8421c44e261824d4550ca4f83b89148ac0e6667726d981e63d9464dd4919dfc9d5e031fcf53275e05d57c11c35e17ce0b0198c36c4e2bc3d42b3e5ac6ac
 DIST x86-debug-libreoffice-kde-6.1.5.2.xd3 387793154 BLAKE2B a6b780aadac5d57ac1a13cf64ee8a17f80b0a5e9d82d971a9e0f0a7099123e35b51fddd21973f23c5230e5401f29287e9e02db02c48ca20cc36779740ce6e108 SHA512 46944afb6e92c785804764dcfc3c17ac72bf03b88045fef85c967a9cbbaf36972843070ab6e581a9bbf276521de75d6fe2f0bd405ce7d83e199a941f6085d6b3
+DIST x86-debug-libreoffice-kde-6.2.4.2.xd3 453229351 BLAKE2B 57af69830ef5ce52e565aac8b2f6f4b2c5fa4a272be31dc72a66c9a0cfcb781eae71984f88a0e9e1b7a410b26b3ff3ff1840d76311db3ac12fa44a7c439b37ac SHA512 98b6fd49c4818be914219d2c64aabba7b51719315608e721a6c4a44bf7e988fe4b6330448d001eef5cce1cf98804bef5bd004c906197f1983af4dd30bfdc1937
 DIST x86-debug-libreoffice-kde-java-6.1.5.2.xd3 662820972 BLAKE2B a8757a1835b407647946b1be97db197e056fbbbcb32c7f3aeb935aa7721d347dfa82ff5ec80e56d5a917308627946d44b6e42aa16c0430238b9c9def2ab0395e SHA512 f9b9bb9fc24e978a61f3ba04e4b1362364fdccb59eb60274e5adcc5e4d70b694f6d866f4e6879ac7486ddc4152be55200e9995642c7add6c00341be58d1e92a0
+DIST x86-debug-libreoffice-kde-java-6.2.4.2.xd3 796187237 BLAKE2B ab7a0dca2ec127f14b05237a5779b9a9c6fee355d73ba0e61ebc90a7d528ba8d32e1abc86589c04f697ce476e2814557c4d2d73596c6f01cae9563333b7c1e81 SHA512 9e5ab3d39f8d0457ad2440731c8afb3b0c4668c5985c5acba1c8f6fe76ffb9230a4df9babbef71b0a639a8a96111560cb8b79ac576887642a7343238617640be
 EBUILD libreoffice-bin-debug-6.1.5.2.ebuild 2626 BLAKE2B 62ef593013fec0d24717823b361c0d0948aedc1e5bc2c99795d9b1f44f38f6e6de0598beb13342ceac5a7a8f247a981c9e9fefffbb4edd3ffc227aad57d8c632 SHA512 de472a71d20ae953b2a1f7da843c0cf24b25192e49d6f39862ec301734f5169e890c4717da8a280061b98936e7352662b0eb822e6587c18b7405c7a6f26aeb28
+EBUILD libreoffice-bin-debug-6.2.4.2.ebuild 2628 BLAKE2B 7d34381263f6a43cf378a806d12a5efbe04d6d45eea1d4a4e89d2dc929a37ece029b9c57640e51b1ea9d7709c24ccdb1b3df14419229efd3d6f2ca3f034a85bf SHA512 43b2222cca3230ead4dcf273d88be058db561a314c3babfd125412932e49c4c373ef27799ce0c8cb42de93d595cbfc366eed3973f66ec0b4bcf2795650a01563
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.4.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.4.2.ebuild
new file mode 100644
index 000000000000..435287d3932b
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.4.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.kyomu.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [ -n "${patchname}" ]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index c0470d6cf160..1d3ea2b7d06f 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,15 +1,28 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
 DIST amd64-bin-libreoffice-6.1.5.2.tar.xz 81458964 BLAKE2B 0205fa319cc248062327489aaf565bf8d4fb24bd66b4b5af3f9dd4ce6bff34a9cde5258c5a81990f72a4fc0ed503749120db5021d50ef62a0ae69fca6e6eded7 SHA512 4f67e8a17b837ea716f95898334ff7c1de53504e79cb5b51d202724798518c4cda536548cd284ee394d7c34c8727b1c43d30004933a8113f84af4188486fb2f6
+DIST amd64-bin-libreoffice-6.2.4.2.tar.xz 103982884 BLAKE2B e1a7228ee94784827a689aa29f1e37f712d5ba9bce1e0f8d4f182b5fa93e5f9ad67e2d71b7f3abd36c1dfd893575679d7181b24ca520ef44ff86d20ec7bd0b45 SHA512 2e0a4fe2a12be7bb38d17e151d5c24f852d838a98f2dabc2f2192d2d7d2866457d69767aa2e0caae0f48a0769998b1ca29d07be07a151478da0c02f70e9c4525
 DIST amd64-bin-libreoffice-gnome-6.1.5.2.xd3 16971562 BLAKE2B 39c13efdb87f9d7db5fb22f4a16b95db03909046f385660edad19c0dca53501faedf8121d85f0459459b5aeffa4acaf029abd63bc8bff91068328fa62d2ff7fb SHA512 646d851389cacecafbb5c1fb7c628218795b2e6e735cc0279f8f87fb6b52e076ad200cbc6d2e7601dbbddd197d42c759bc46f2727fc12fcb851261ac48e10114
+DIST amd64-bin-libreoffice-gnome-6.2.4.2.xd3 18912626 BLAKE2B 5710b82bed9a0b5db59b3709f6f7bcb54bfbfd4ccaa86f4e84949ccfba0ca71f1d0e8a6b3d9addff1e59e7a35504cb26b3f262d26d38998dd4ec179b33b88d2c SHA512 1acb5ae243ee212b6fd2b0a48aeab56b39f338b574b049ef67e58c703ab0474026853e605a39d8f30fddfca48b961ab7d4fbe40a7a49933dac656af6e84bb2c6
 DIST amd64-bin-libreoffice-gnome-java-6.1.5.2.xd3 27382980 BLAKE2B cda280a0f7fc4b7b33ade0bb81ba0d8bb11cc39397afecc591acce9222c67e659ca98e5605a48675080d410db9c6f54abb5a6abe4e3d391f3053012321268e26 SHA512 13b88b198c3a78aebc19de85a93dc8413e67a1ab54baeee78ab25e0035199fde311f0f974b1d4dd07a6993377ac983b638bd0de56239609bd938ba306adc9420
+DIST amd64-bin-libreoffice-gnome-java-6.2.4.2.xd3 30448355 BLAKE2B 0d3f07b879b67f9135f8fca9a6c2dfb77c746246347d01052fc808b02b70a13a4b4eb772e0265f0fb35c678b05c0f72a5dd0350ee57178850acfed7eb63cc0e1 SHA512 44e32a43a71f3b3c81f14668a5af97361bf3bc1f1bc9770607e34e33dc0b610d4c1443a32f86a124bc2ef5d0029fbcf6d221e91645adf07fba400201d2e3b6e1
 DIST amd64-bin-libreoffice-java-6.1.5.2.xd3 26020195 BLAKE2B 7a28ef04f187544b7452174ab183291f0ab6a082b2ba477d75caf4b08b89e59bc2f51183076a864e3c8844d98875c9b627a00f93413a92d50eee0ecf17ad03a9 SHA512 7a9ae33dbb06d05360d5209494e8fcb5a104900770f332171f561201806e049c0f4b7fbf468bb0d4c5ec460747751eb76da2c190881de2fff2ce84fdec761def
+DIST amd64-bin-libreoffice-java-6.2.4.2.xd3 29169303 BLAKE2B 70b6756bf9625ad4b6ae5eb1bd3d7f4c965c527f7fa87f2074ff1fe7510c374e93bb07170939b6a08e4d6d68df7d47aea1c4ffb77d93f8f9d7fc51034615b294 SHA512 4118d897800b20b73f414daf594d39ef5b5b0d923d4b2ab54ea26b1346c238ab3d7becff7716e2e88da51d98918bfeb122405c95c3e1db926e389b137fb98dcc
 DIST amd64-bin-libreoffice-kde-6.1.5.2.xd3 17204328 BLAKE2B e390a5e1fe64e1be86a2a7a01a695ba4069c916bcc3f181d73c5abc68c131c28dc06049f45065a1a51420c816a1dfc11d3aec4869ece93048988fda4681d3c93 SHA512 67b7c336739e2bc72800de61ecc408d35c9e27abd6a18e2f5d259fe5cd601986fc93935990e980837481c741a5d752b2fb80deefae8f04378dfcb5e2a61edf67
+DIST amd64-bin-libreoffice-kde-6.2.4.2.xd3 19572204 BLAKE2B ccadb3d665cea7e036f92ed813795879df59c32092c09d9e0b2fa11ef4f3c402368f57d3713ab8693e4f0713699d1cd132ca31664eb3309b487c67ee52be6eca SHA512 1c1e40b0b256ffb623ebd5a289c8bec1b65468de0dc0242eb03e37e8894c5cde43b122846698524d4b20804b28ffbc153cab33ef08c61fb0f3f7860ee8b5fec6
 DIST amd64-bin-libreoffice-kde-java-6.1.5.2.xd3 27569581 BLAKE2B 7a28bac9fbf648df15c8182440585c9c44a6c8487729b492a09b16edf122ce715b18d521dbd98bdf444c429f2c7766d13f40366fbb0ae37834df6369288bdb02 SHA512 d112d1986d69828e597984138345227221ec1b792629fc2d882c6195b0d9c4d33a25c170b8edc4e796b134ec9b3171f659da5e2c022c021c462b3c7e4d33e708
+DIST amd64-bin-libreoffice-kde-java-6.2.4.2.xd3 31004830 BLAKE2B a7084f685d9315f0dc367005fbefbc00f42458e4cf8e6701e7de062d8dc401c28f55b96cecbd315ef8f2fdaabce5288715374f00257552047a78ffcc30db90f1 SHA512 da6e037640ad107d3049142f834d2803821099b03cbee6fef875afbeaf33f701479a528b3a350926f37b59e5787ebe040c4b79daaf9d2ac0d6ec5196af4c584b
 DIST x86-bin-libreoffice-6.1.5.2.tar.xz 83728896 BLAKE2B 4b94d9090b59cde87aa779c566a41d77a90579f177d656689804168a818e516dc19eab0719ff0cf291d408b157782eaf42b0d697677ca3037fd25d08e115d849 SHA512 63356809b2534ba170243a8f517f62a0b1474f52330a772e7b66014841ce3ac8f635196f78933da5544323873cd40bd939b59e1fc2a8638f014f2a5279b5ce0b
+DIST x86-bin-libreoffice-6.2.4.2.tar.xz 106392740 BLAKE2B 8552710a146d18033dc32ee4e24061c1dfdddce14ac9981235bc7067ece4c6a3d3606a85d9077644129d262c107f4ad04dab9d9c82e91d78770c9147c0f6da99 SHA512 1a394eaa3d432a9165e6425b7aa085c94e931f1fee8abfde3478b7d1c281759cce0d531135fe936e55ebb911a308de052110ca851560c7cf6d5f8b256c1ceca1
 DIST x86-bin-libreoffice-gnome-6.1.5.2.xd3 15117228 BLAKE2B d628407c11c967c3eaa3a67d21a5638bcf64a9db6fcd6494c8622a906af26ca7d16d98635012d52c7c690f812a27dea1496d194e12de44eb96ce0424299a4b14 SHA512 af49354ecda7cdf90268308d6b6dfff08c80397d8e8006d952d759dfa36f9d4228acee0719fd4148a936480f4901bebfc28e68d6e2e04017e3803fef8cde9203
+DIST x86-bin-libreoffice-gnome-6.2.4.2.xd3 17326095 BLAKE2B 3d5596048653f50262f35e892252239b47273443a285d5472e3898b3bf4964cfe5a8698ac46c3bf9edae447993d74c5c1d8336545c2c171040e2f1219e734a8f SHA512 ac89e94e9e64db01c2b358728bdd31054b96efe70f75c200725bf9403250aa58bbedae114f64cd95bce993c8e6f064cd6f2c05461589d23eeeed170d0450552c
 DIST x86-bin-libreoffice-gnome-java-6.1.5.2.xd3 25335202 BLAKE2B 9b98001c51861ebd59d6420c54459a3e2e29d400bd3640adc3b4895e480caae218b8d58d707cf05294d460f584927f7e43de9b34be70def40d567d4280b5d73c SHA512 ad74e386cc718697db24f7a90c328c66413cf046d6d0f0573b46ed6168bd4ceed2956f7f880f548cb84a0a418ab27681040753cafaf81e19b8454a89a459ca82
+DIST x86-bin-libreoffice-gnome-java-6.2.4.2.xd3 29605719 BLAKE2B d5a4960599251a92fec1481383d5f5c60229840fbc94cc62051c52a3635bed32d30ebabb4c63172bae0f356fb5b0f7c634f9de89b650fe4cc8dba2bb2b740695 SHA512 c4b8ac5424a27a6e87a914edcb16ba897d7c9b3b6d9899d765b1b2530a4cea27468883456daab32f83a1936a5700f8d726e342e138d2bc80fa85dbd4ecbcdd30
 DIST x86-bin-libreoffice-java-6.1.5.2.xd3 24864117 BLAKE2B a990edae78593ff6d97d51d24b6b17e7f5ca9fa65dfc37a60909f21ce7d73ef598b7958eb7d35ac61f9c635e319ee703aa599cd66fd553cb6447d5e2860c30f9 SHA512 7e2e227365502d1037679041e861f2a547bb33dd818e91c754f1356bde69234cfd419119aca861ec95a2e2eeaf62b62210bc63379c676451d77d6a2196d35946
+DIST x86-bin-libreoffice-java-6.2.4.2.xd3 25920366 BLAKE2B ffa55133cfc039f306e225968ce953cdc397b1e5aa1ff6c4508887f485c2f73beb82f4ae46586f2af2833a371ee9b7373d0b7405884e355dd1b179ebc0b4a32b SHA512 8d4109bdb5b68787d92869424bb8f87ddec47f360ced68050002562459b99e39f4e925fa96904d92166d431ffb06eb3675cfcea822097ce1e858657dab844ef3
 DIST x86-bin-libreoffice-kde-6.1.5.2.xd3 14984951 BLAKE2B 2fa3af871e90833ba492d35443937fb572fd4cc48cfcbd210b542b6963a93c007d29d007a51e54a73cef8cbbde4a9866229013920f5ac981e15d6c632cc9fde5 SHA512 7f8ceb5c4235b1e3892e5c8ea708f54e66c40535653ba4703a45a111c20339355eb90e382b8aea4336956261a2da46c1369f658a47fd0ad0646ed742e8490687
+DIST x86-bin-libreoffice-kde-6.2.4.2.xd3 18283075 BLAKE2B 485b77a94350861c615388d591963aa327783dea382084c2394e13b51712e85ad6d972e118da91dc6a0f65663e6ef72d043c435f34f8f3a6dce548a997a4dfea SHA512 8a987e679a3c078c691f7006dde590cca8f1f3d2a06fe164244da813ac8b1acbd766d271fdf23864871f835602d4d00e2b90e693cdc2da4a0cddba9bc7ce9776
 DIST x86-bin-libreoffice-kde-java-6.1.5.2.xd3 25252595 BLAKE2B 207ae00d0b210bd869d3d19d7348ee0380153c7d108ddb03d5bdac92718b78106fac321c2df00dc2cc71cfdf791b309a591b530c936ee1673314d55e30d46e9c SHA512 70edcebceee32c82c78ba704cb292cad8e59f31d8d58f72c525cd32723726b251221370c6d2dfe4a54d3f0615f0859792160f1c66b20d8f7b77030f54c084073
+DIST x86-bin-libreoffice-kde-java-6.2.4.2.xd3 27890295 BLAKE2B e5d9ade91a15f1474d7cc41216a363ffea712020a6f35af7080ea95400101a3158aca8bdcddac9b910c8dd6a9d454d4e9116fd92b3330fc57950fc421ebdfe60 SHA512 3d82e794770237376293b2048f8e1ca38320e75ebaf3b825a074b00cf0c710a43faa3cee328e310c689af34aa466bec7512cde566bd7cab5d814aebe39c31eba
 EBUILD libreoffice-bin-6.1.5.2.ebuild 6776 BLAKE2B e2ede8bab5f7463da2e97e8ec0cc377168c06b1a86eae93e9f072dfc659f5d1d4e71ed808ece490f630d118be56fdd0932621d30029462af7bb7c7215f49b6e6 SHA512 d6f3a381a17bcafc9b880a12b0957024fe9627d27f198ad896d177880aeb5791b72fd177aa852c8deb77292f432691122099c79700380c57c68264f82adbdf9b
+EBUILD libreoffice-bin-6.2.4.2.ebuild 6778 BLAKE2B 29f89558d775364d06739726a652c8a715c832caa550b21e73edc5d24c8646db5ed0a157064d0d5dbd7f2a3ba9fd92b6b574094ed17d89c990b842923c82b60e SHA512 6db14be88612da6a173bb8813db7d794056a715486d02bd1c8803ace10eeb44e521ef3a4575213c8d7c707c667a47518185f67e6f33f2d65f8f7bfa25b4a6723
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild
new file mode 100644
index 000000000000..5ce58420e2e9
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.kyomu.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="threads,xml"
+
+inherit gnome2-utils java-pkg-opt-2 python-single-r1 pax-utils prefix versionator xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.6
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.65.0
+	dev-libs/icu:0/64.2
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-8.3.0
+	>=sys-libs/glibc-2.29
+	virtual/jpeg-compat:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	app-text/libnumbertext
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	=dev-cpp/libcmis-0.5*
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.14.0
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.24[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	net-libs/neon
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus
+	gnome? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	gnome? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/pango
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-${PV}*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_pretend() {
+	[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
+		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [ -n "${patchname}" ]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 9d7de8e0f17b..21d89060a45c 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,3 @@
-DIST skrooge-2.18.0.tar.xz 20951548 BLAKE2B 7679c519cab88a165c878dbba0a077d7f4cddc9bd1252ce5fd1e6f2d90c98b9fc39b8251df83470debdc8a6fb4f093fcff55768aa41b6a4c379c9e4c4f558f25 SHA512 b8a222947f535eee9041e6bc71703a053fa9a201de352c5f39fcbf35be5259f76532ed5291becab4c676ff8eaba7727730f6d957af36bac54aa4ada11db25da3
 DIST skrooge-2.19.1.tar.xz 21111836 BLAKE2B 5a1a7a8212699ce657e33f5b2ab12b305a3c6840dccaeff20fc42796b3587d02a60cd1f2313909b6411e9ad71c4f1bd254349d9a9846c6707a31736507713fef SHA512 4c9addaf56bda0a575c995a2d9229927f6c23ca1931d8ea50ec83afab31149006fd0cc339af79afe0d046c00b5d3dbe4c629e48eac404a31fbe45b3747dcb869
-EBUILD skrooge-2.18.0.ebuild 2498 BLAKE2B 7f84d72f121f53b8468ece77cb7bfa38222298fa0c9dc96030cdba8944edb12b3b19bb8b9832c76bde11fe24c6a043725f975e694c330d72c7889bf5c9185795 SHA512 64d5705cdc86afd350600591ffa53980ac18ab8840993d0bd78dc84725584882327b00058e52cbbafeafa9fe49805ccca8088c770d3145aedba17c1d2cb1c8df
 EBUILD skrooge-2.19.1.ebuild 2475 BLAKE2B 1f540144c20948024ef8f19fdfeec84d9a1124644dfcefb982f98f977b6cd2228856d56c0ba06b65f2f0d7434b143a6e2d992341ec9a095c633d1706f4acb571 SHA512 530b6edbb410e9b54ffa1f0f43a1ce6b7304565de1118a030a61a3304f5f75cbec359023dd01e073528bc23a5e95e07dce52b132e51b642850cfb80e8f3a54b0
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/skrooge-2.18.0.ebuild b/app-office/skrooge/skrooge-2.18.0.ebuild
deleted file mode 100644
index ff20f250804d..000000000000
--- a/app-office/skrooge/skrooge-2.18.0.ebuild
+++ /dev/null
@@ -1,100 +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"
-
-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
-}