gentoo resync : 11.07.2019

18 files changed, 717 insertions, 16 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 154d9c14790d..fe40c9b79941 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 5486e001d5a1..6c4937ec577b 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -5,10 +5,12 @@ DIST gnucash-3.2.tar.bz2 13383942 BLAKE2B ce4beb9eab290bbc85c4b3bf68b205a8ebb274
 DIST gnucash-3.3.tar.bz2 13440713 BLAKE2B a308af90d8a8e50eb732d29c7eadac1fb75b63006da5bbaa9044039c43c1c17976c6b6fdb1706a08a527b75b1300df3a8ed469151370097b0308a173a170e41b SHA512 4bf0369ca9b3c91c98a0d916f0befc7e5675a246559a6a72dba6592b64f56f3cbd1885b0711e44e8d9cca290be742812763691ae2f639ea31ec534e52e17b3f9
 DIST gnucash-3.4.tar.bz2 13564432 BLAKE2B 478d8e2e4acbd0725ceaf997a1e62ba3875e9d4a003e8a3e69111a9d29118447fb2da8ef3e5dd5274d83a3adef1ee9f4a153cdfd17cabe69864b53bab8c7e813 SHA512 4cebef0ba70e59a82d3b2b7b0b138ddb22e8866dc761e156ff1f15920145d12923719effef21ad4c65ccd62fbd14a1529cf0bfcaab70c5b33d103761d08062e0
 DIST gnucash-3.5.tar.bz2 13766397 BLAKE2B b840fa6af719e1d21daabd8e26f7026a12ca9cefe8c0f644a8382b42c34a6dec2dfc67350645437c2f12792518f289f446824a8c99ea83453e69d976c3cd5c9c SHA512 76230d2fe1ba4cc605d0d58976ed3214b10a2549fc7eaa1e327bbf85c861baa082523c70ed088a59bb56deb6af9a7808752fc719eda0df3e9209cec05c9c8d13
+DIST gnucash-3.6.tar.bz2 13811045 BLAKE2B aa722755e168b6096a8ad0bb05d3c67be9525d5e9e6fcf076c0b6bdc3188815017c2b1bcb308a6f8a7581315f7d9ab67f85b24486214ebbe7ea5a0428e552ea7 SHA512 3d99235a6171e7189dbb15fed11e7f3acb4f49ef8dc6124b26807e74ce4326ac5ae6e23e693a34947604ecb0253ecbcd80f669803a629eb7d236fd3444dbfe82
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 EBUILD gnucash-3.2-r2.ebuild 3957 BLAKE2B 370393aa80d47a51ded47b3a582385fca4ab3e6e33e7802c56ec86d8cec66cacded0442c39c8cbd6563a9f811065e95bd2a62657645a67c259b9f3f23b380e63 SHA512 17b11b3df4088f4575fcdef67a9b0a3cbf0204b2027124683570d124f41f4009bd87b53337aa4d757447c29a4524fff558a69baecaafe1d18e2a39142f1795da
 EBUILD gnucash-3.3-r1.ebuild 4083 BLAKE2B 0c0f75dd4b3d476ea03b667b56a48a50a484cc27257208a49d7fc012ef62ea0665d2da69b4dd01e3bfa042644035548779d1eda57f5453b4a64b1b4dfffa764c SHA512 5e6fc01fc09b3cd03f0ac33a82342b5953bb0e39ceedda8e576d61f82d7f2142a4f3288bcd2b73c4520c04b95ea6e6954c6615d4c90c5179509959a50c503968
 EBUILD gnucash-3.3.ebuild 4025 BLAKE2B 94b349ed78db812b6267ac108cbc9c0ad12a5f13a1ec6816f0b2ca0eff92afd135ccd19a473fb3f12706e9597589a9069ca6095cc0d53a9fb577b8e416cd28c2 SHA512 e33005c224501bfdce4f82e809978dec9d273de55b8eaf938908c5f2feba68125c3b65805da70835dd5439fa229f13fe101fac737b9b33fd4bf1de6578963e3b
 EBUILD gnucash-3.4.ebuild 4347 BLAKE2B 746435f6184b90c177adb969ff67e4d26803258cb0970adfb30f7d240d73f40ff37664089d50aa180d0bd75124079fee9d6c13b53648514e5ee66b7b30b0de15 SHA512 1285926767b3ddb372cd5d555d93b543d40abb2bbbd874eedca0ca74930c15335b26db251a9dcbce3a274bcc57912e3c0f98f43b7877b80f3bf6e85d3ac69e4f
 EBUILD gnucash-3.5.ebuild 4223 BLAKE2B 5f4f025d1b6e2f7a39603202296b1491e54c21e14089061ac5e3034221b6d853f5ae47dd02351206aa4e17f8830d9359c01eeb86ea2e7b8c7d515c4f1029683d SHA512 4c38db2ef50b9083e2284bb61e6eee5b4e2b758f2685ae96d94406e1f48a44ffe439738d14f2f1985ed990c0097c2f7399be76c39ec5ce3ad55d4d07a6094f5b
+EBUILD gnucash-3.6.ebuild 4212 BLAKE2B bd83a4d38c258f2046fab05797a9ccceb3e75428bb00ef42b28066645383aea052fe7800b091e05ec8c1da037c03af6655a43afb4955c4f35f50baf83fa1293f SHA512 48877cc1d507ce5fd85594c3cda1a806d8c5acfa4f6479b15b9a719c1cb743196b367fc0a1f4d0fb5e729a021c725578869c0f349c48001aa7421ac741ddfa8f
 MISC metadata.xml 877 BLAKE2B 0fcba4a83ba82aa6634bc2e3d71da766f2890340e827ba478157fae994456daaecd12722991626069e04086d670a77f156e378a5b0d7b8ee35717561ca944a03 SHA512 1654790fbffc4ec76fc9520221877ad7eaa8fc774f4a05e9e250e44c0fb989081bafcacb018c8d2f6a4787d1794672a87e09c1687919b544a8f1fb36bb449bdc
diff --git a/app-office/gnucash/gnucash-3.6.ebuild b/app-office/gnucash/gnucash-3.6.ebuild
new file mode 100644
index 000000000000..9999712e8bfd
--- /dev/null
+++ b/app-office/gnucash/gnucash-3.6.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# google{test,mock} version
+GV="1.8.0"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2
+	https://github.com/google/googletest/archive/release-${GV}.tar.gz -> gtest-${GV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx
+	  postgres python quotes -register2 sqlite"
+
+REQUIRED_USE="
+	chipcard? ( aqbanking )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# libdbi version requirement for sqlite taken from bug #455134
+#
+# dev-libs/boost must always be built with nls enabled.
+# guile[deprecated] because of SCM_LIST*() use
+RDEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=dev-libs/libxml2-2.7.0:2
+	>=sys-libs/zlib-1.1.4
+	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxslt
+	aqbanking? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		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]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	postgres? (
+		dev-db/libdbi
+		dev-db/libdbi-drivers[postgres]
+	)
+	python? ( ${PYTHON_DEPS} )
+	quotes? (
+		>=dev-perl/Finance-Quote-1.11
+		dev-perl/Date-Manip
+		dev-perl/HTML-TableExtract
+	)
+	sqlite? (
+		>=dev-db/libdbi-0.9.0
+		>=dev-db/libdbi-drivers-0.9.0[sqlite]
+	)
+"
+
+DEPEND="${RDEPEND}
+	~dev-cpp/gtest-${GV}
+	>=sys-devel/gettext-0.19.6
+	dev-lang/perl
+	dev-perl/XML-Parser
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+PDEPEND="doc? (
+	~app-doc/gnucash-docs-${PV}
+	gnome-extra/yelp
+)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-no-gui.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	xdg_environment_reset
+}
+
+src_unpack() {
+	default
+	cp "${FILESDIR}"/gnucash-3.4-test-stress-options.scm \
+	   ${PN}-${PV}/${PN}/report/standard-reports/test/test-stress-options.scm \
+		|| die "Failed copying scm"
+}
+
+src_configure() {
+	local sql_on_off="OFF"
+	if use mysql || use postgres || use sqlite ; then
+		sql_on_off="ON"
+	fi
+
+	local mycmakeargs=(
+		-DGMOCK_ROOT="${WORKDIR}"/googletest-release-${GV}/googlemock
+		-DGTEST_ROOT="${WORKDIR}"/googletest-release-${GV}/googletest
+		# Disable fallback to guile-2.0
+		-DCMAKE_DISABLE_FIND_PACKAGE_GUILE2=ON
+		-DCOMPILE_GSCHEMAS=OFF
+		-DDISABLE_NLS=$(usex !nls)
+		-DENABLE_REGISTER2=$(usex register2)
+		-DWITH_AQBANKING=$(usex aqbanking)
+		-DWITH_OFX=$(usex ofx)
+		-DWITH_PYTHON=$(usex python)
+		-DWITH_SQL=${sql_on_off}
+		-DWITH_GNUCASH=$(usex gui)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	if use python ; then
+		cp common/test-core/unittest_support.py \
+		   "${BUILD_DIR}"/common/test-core/ || die
+	fi
+
+	cd "${BUILD_DIR}" || die
+	XDG_DATA_HOME="${T}/$(whoami)" emake check
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm "${ED%/}"/usr/share/doc/${PF}/README.dependencies || die
+
+	if use examples ; then
+		mv "${ED%/}"/usr/share/doc/gnucash \
+		   "${ED%/}"/usr/share/doc/${PF}/examples || die
+		pushd "${ED%/}"/usr/share/doc/${PF}/examples/ > /dev/null || die
+		rm AUTHORS DOCUMENTERS LICENSE NEWS projects.html ChangeLog* \
+		   *win32-bin.txt || die
+		popd > /dev/null || die
+		docompress -x /usr/share/doc/${PF}/examples/
+	else
+		rm -r "${ED%/}"/usr/share/doc/gnucash || die
+	fi
+
+	use aqbanking && dodoc doc/README.HBCI
+	use ofx && dodoc doc/README.OFX
+}
+
+pkg_postinst() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+	ewarn
+	ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+	ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+	if use gui ; then
+		gnome2_icon_cache_update
+		gnome2_schemas_update
+	fi
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 7d6881115a6e..28f426555e69 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,3 +1,5 @@
 DIST kmymoney-5.0.4.tar.xz 11708760 BLAKE2B 62fd279039ef41078fddfc4a69d9a8e7c425965114ad91464ef94f7e8f72f07ed9cc16989d1ed6ee01fdc8cdd274afb231fbfe43e8a5e0c8d17c33aa17fcb70b SHA512 406460f33b32941796e8b0a2fb21f783db6c2444b35b0402647e688b78ecccb82401a7a1fa7c008ffd840cbd88c82db91e367be917f9ab7b231a0208b439b91f
+DIST kmymoney-5.0.5.tar.xz 11706112 BLAKE2B 7c0e51ad2404a88affd7b99c8ca59b813b646a7d995b5d7f6db311c8813f2966d14b34271f3d9de73d07c763fb191e9f4c0737e64feb35a62cd719856c20bab1 SHA512 ba8033b974b93d47cd2a732a352025715845d3dff016a49babb6b724d5e9b726f84f5e2a1f1f42765a6ff35a00d3d995397f2831981d48cb8468d1407030584c
 EBUILD kmymoney-5.0.4.ebuild 3224 BLAKE2B 49d121d49979667fad2c537863da358a5ba61c008eb031afc9281a46b156c833477760dfd23050dcda73b45f4eaa00a296a34d829cf19958d12abd4d2508b044 SHA512 23f89a6494cb46a3690dc3d39e80ff8f56284c3cc4dcf02206a3265a2cae86f0dc10b0e5d17191ba8110c2884efa580262207c86518f0304af3e696e206b9d3f
+EBUILD kmymoney-5.0.5.ebuild 3227 BLAKE2B ef31c4de4105faecbc1cd13e31491040a549da8665b1c0b5109c8709fb0f8cb66e2a2846cabf087a3a4dff948c9a96cf636df070139f4e9d6129292baf9d6f52 SHA512 7cd6d196cb8db7c885664b2c1f9ecb2a6410390d11f4995998f165485e2d4ed045e9200fab39c7d5ce5d1a5f1460f61b9146568d614217420176026f2cc0a111
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.5.ebuild b/app-office/kmymoney/kmymoney-5.0.5.ebuild
new file mode 100644
index 000000000000..8ab833903522
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.0.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+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"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+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; bug 673052: needs kmymoney installed to succeed
+	local myctestargs=(
+		-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 a806e6bdfcec..619c1cea5133 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,14 +1,27 @@
 DIST amd64-debug-libreoffice-6.2.4.2.tar.xz 1637546044 BLAKE2B 45e7b5e032c992906ec85b16a9bf4621637b5f9475df319c9d3a6d0630ef6ea97e7de2fe1e923727da8af2d3ebe1a6d28010d560ea2a877a7baf51a43794b2df SHA512 b7cbcf49143d6f5296469f27266a6329b8d9c54f9efb662a6a69891c6a3f1e707169813ae6a5468d5d84545336836e9b3d1ed06b51a9d574e9701ddc94b5e95f
+DIST amd64-debug-libreoffice-6.2.5.2.tar.xz 1641072480 BLAKE2B fb084df67bbcf7af16050c7e72478b16b69c7cbe4cccf18ace02907e98e5e5d49ea516d6aa9a1c232984aafcbbcbcb009ca9df3f074642ac1c3ab9860f16757d SHA512 7f7bfb9dd90bb6e5a7b45987b46cdd0da29c633e93511d4a275a073a8fe15b165770f7536af5f2d351be636c904318d71a07d91da15da08dea4ba84b0046fc4d
 DIST amd64-debug-libreoffice-gnome-6.2.4.2.xd3 468745410 BLAKE2B e7b41740d4446d791c39851f1fe631c1166c722f5504c67b27a1da60fb5e02ece406c64ef27f1ef228e1df53b3d3603518dbdf5643a1aaff0f507aaf0b2a1d78 SHA512 65f79beb4e60713aa0b22d382ed3b3da5a905a1806ed11c86cc0c72cb1d07b16ea26c3228d91dae422ea720666863ee53a954d3e819b6ba5576375093f629cd1
+DIST amd64-debug-libreoffice-gnome-6.2.5.2.xd3 1609525 BLAKE2B 24df754b5a03bb06e08a3defff41d9cc135c787f7427c6e2948713c4f1f27cbf2ac20d8d9df25ee648221d36c355fdd70a39ea9498cc88a52a8c1fbb0ea396eb SHA512 8c34bccfd1ada25e5f3076631a1c61bf359d2e26a0ea97de3b073622e801e57c24cf1675f3b3baccce12b9d803d3c5ad432cb724074119766c60d416535330f4
 DIST amd64-debug-libreoffice-gnome-java-6.2.4.2.xd3 874137627 BLAKE2B 85738277be979d9af96c0c33005dca8abc0c42bb940f2b86ad8d3ad731efa38328103aa6069e0e3835c57761ce9703a16c2b7665975f1888a7132ee9a030ff90 SHA512 e598f3766c9febee1b3661f331cec88b4cf73f375614600a5b833a725b1eda9536dfd73cc761f0667328bb7ba3d203f22a63e5767f3d1e65fd3808ddc66bf61d
+DIST amd64-debug-libreoffice-gnome-java-6.2.5.2.xd3 866015327 BLAKE2B 014989b5f558590dc55f4f82d1a502804c6cb03baef35674fcaefb858925422b0ad21c821fe8e215c6cb6a01e12642d217a28bce42591034d808e5bc172869f1 SHA512 318e1fdf09bd06333e81f557ebb3ef26e745920022d8a1ff25f481737faade03be6613b39539f6e0ce4c58404c1baad3f1217c4b17673bf740b1c421d4f42933
 DIST amd64-debug-libreoffice-java-6.2.4.2.xd3 857444149 BLAKE2B d003dbed9e776d907264e4b5bb58a216c17833b5face6b42cfabbb5055a9c560a37e14babf880903710d029ddd5759596daccfadbf0fc0f81032d6175f4bff64 SHA512 d2206a50062bf48d1be7cbaf2cd74a2a0b76c410c7550c2db00dd3ff3784d41b3f3634fc6647e2221dee866465a6c060a8686e23e5c45d36b05a7362887fe91e
+DIST amd64-debug-libreoffice-java-6.2.5.2.xd3 864389819 BLAKE2B 14ea27a4c869c6cc3241d20d55f30f9bc471c4bf0816e9b4e7b1e18c47286734c752ccf1f438bb116ba3f56b10827a537a9dbef80f9b370d2ee6bafc2be45162 SHA512 ee04800538235f58256784989acfb8bc1a3c842016ee6a52ee875067f4614903b3de8367706f53e2a65d053793f50f536518fd409465af49bdcc20683014bc85
 DIST amd64-debug-libreoffice-kde-6.2.4.2.xd3 482383176 BLAKE2B c3a08965bac7a52828bc5403cc3f08366d239886f49f65709e86a54d859812ba275c3e0ad1d8b5fe7d10b7a229207273daf341af0f014c9cfc9c9d1a04269d8a SHA512 151111f047b57194a5d1be1cd092dd1e8e28444fbaa9a1516941b7cac93c69187be21698a26fb8442c399f234b60c9c8b99ec0ffc1855c968d9eb0c687422705
+DIST amd64-debug-libreoffice-kde-6.2.5.2.xd3 462116544 BLAKE2B 27cba58f6329a9318ea2c33959fa7bb942449d033bfc6cc3c0b730d2c1e29195119810205a49951639487cfcbb2b433539be191439b10f60b875a18429be8741 SHA512 50e1533397ab7d94004462ad042de09653fa75a87492acbc1650f3808c6187fb79e66fbfcf1b3088ed67711747a4601b0fea2c6c8a34b5ef8a167ee6bf535959
 DIST amd64-debug-libreoffice-kde-java-6.2.4.2.xd3 887769486 BLAKE2B 8914e9f23e6eae056df8afb00ffdd4990a982573b1fe5041fa37b3a40deb4c4edf1d56eb1a6f8134455e769f5a91f7da41b9105740a51c1ec3c104fc5f06b19d SHA512 021255fe383ea9470a233905daa48b2fcb1f13e1e05de625a370236a8003882d1030bbb417695e91257490e51943a6d04fbbce0d9b140468073c8ace5226e786
+DIST amd64-debug-libreoffice-kde-java-6.2.5.2.xd3 869114510 BLAKE2B d158629b437118e5bf00c637b33deb651034323a5931bb75d878fe4e1d38c1e10bf4dd6426f75cc3d7be6070e657f89587507649abc8929f03c9b19a1f6f9b95 SHA512 2849c1fbf12272d8206a3f37df5278d0cec3387de65d07f17b466a040ccb74b4fa33654dd6b54eecefcf986855a9ccb840545dcf4a926b7e0e6ce6ca07ad1185
 DIST x86-debug-libreoffice-6.2.4.2.tar.xz 1598638312 BLAKE2B 100d32663759aa0b2d3f0540179b267c80fbff43bb997775d2ec47a3b22fecf20c058aba91016469026a0a6aaa2df8348eb130694f1ca49fa31ede16a297eac1 SHA512 85173fc999d56acf1ad6dc7857b97f6c1a915e02bec6e603b79cda896f0d3b72d0c83e12e9d7ad1f13e5ffd7030f159cbe649590005fc8761566400401e7b003
+DIST x86-debug-libreoffice-6.2.5.2.tar.xz 1601980988 BLAKE2B bdd311cfc56b0458a10365d4cfe02588e533b84adbf6e7fc9aa23eaacaf152f2192e4ac4d6efcee5499fd83611993c3926fea24700d0f38755d9f1ad885397e5 SHA512 5ff75c07bbb39034550a61ee006711b45cd5ee8a51168f95557279f3edd0cfc689114af511933c140e8fd8023da1d5a0b2138692ee741ccfb923ed2a2decfc29
 DIST x86-debug-libreoffice-gnome-6.2.4.2.xd3 454784520 BLAKE2B 729059c75ec90f563148d7d10eb3bb0770ec2ad2ace2126fa3cbddb4e1043313015c62d6069de1750a8f8cc1bcec0dc754251bd6fb294b74299ebee69dc4028f SHA512 8d2dac20a46e56fb5fb6fc9973b7863346d79ea115caa7d9f502ba607573bf78fa07ae0948497c9c586d9c5c60f32a23b91c6955e98fc3be3e0eb3d2a8fc35a1
+DIST x86-debug-libreoffice-gnome-6.2.5.2.xd3 1551594 BLAKE2B 1b55521ac15d999dbf741edcd308907bf5581c1147c82508f53bcb85eebeceef34ac3d94cc7cf87c570a0df74092b1f003c22c75e70972f403f1803d83ba932d SHA512 681d0e2c094abe4038f295ea096e704bb92384aedfe45161c4d4bb0dbbfe2e2ed12a7aa6fa57b5f898d4738b3f0355ab1601a03c719c10382523b8c71da290da
 DIST x86-debug-libreoffice-gnome-java-6.2.4.2.xd3 797762116 BLAKE2B 3c62a50990b82cfc6f5e75ac823f02555736308b00889d52b61b0cb50005828d82b4c1a353dfaf7c3d848fdcf22f5871173fe8d6ef05f7983a65b2c7d79fca17 SHA512 ea43c19bef4d0ecff7be9ec956765135ea7545b37ca7c3b7403ba85959d4385e5960dcfd8299fae4f7a8b7e75ec07f51505ec82a1089b51174ce0cd0eac6dfec
+DIST x86-debug-libreoffice-gnome-java-6.2.5.2.xd3 787032334 BLAKE2B 36844f9fe34427002b6c609814c7c6424634d77ff8685e4370ac96fd7e34bd79c82312e2dbb7a0f6660c0150ab2f5eba2fe7b96359196c6f233eb51ae9c461d2 SHA512 43af63bd77db51aa64200723559ced63c13aaf39b59ece886b9b40ddf6ba7dd19e5bbc65f9aa01fde085605aff36c17401b9ef498877628ede3092fb1795c464
 DIST x86-debug-libreoffice-java-6.2.4.2.xd3 781613145 BLAKE2B 54c62d53e39ec447d5bd7c365377c7b2471d117878bf80c605d699423eb5ba4c80a43d2cfae3041dcb4f26192ad3c8d22792bdd951923827fe4edbe46c5b8651 SHA512 1978d8421c44e261824d4550ca4f83b89148ac0e6667726d981e63d9464dd4919dfc9d5e031fcf53275e05d57c11c35e17ce0b0198c36c4e2bc3d42b3e5ac6ac
+DIST x86-debug-libreoffice-java-6.2.5.2.xd3 785457596 BLAKE2B 5561c4273c8a7f86d7450bcfb21abd41d4e960f534a0faffcc55997310aef404b2eb30ba6d94672a729ecdf73cba91ea1ff868f019c0f9737303bf807250a60b SHA512 3bd5cad22eb5fc8df42ec30c067d7fd77e73ef5baabbfadf71ec6e7cb97224c9741b109e3ece48e3711c7dd16b7b7a413b373d252405f8925e80f0dcf7a8d0ae
 DIST x86-debug-libreoffice-kde-6.2.4.2.xd3 453229351 BLAKE2B 57af69830ef5ce52e565aac8b2f6f4b2c5fa4a272be31dc72a66c9a0cfcb781eae71984f88a0e9e1b7a410b26b3ff3ff1840d76311db3ac12fa44a7c439b37ac SHA512 98b6fd49c4818be914219d2c64aabba7b51719315608e721a6c4a44bf7e988fe4b6330448d001eef5cce1cf98804bef5bd004c906197f1983af4dd30bfdc1937
+DIST x86-debug-libreoffice-kde-6.2.5.2.xd3 439845649 BLAKE2B 1c05eea34715f9306282c642bbf42908e7949f2b7d054b3d41d8eb6839c51a8db264bbd402a4dc996716ec334adb343daccc9c10b1da2b1e3d75bacd8faedd52 SHA512 3af4fc023b102eb094c746414c8d985773af78132d715320b46e26ba1846767f558b85d35c624cf96ce6430e88aa387e128082ee672f8abd546a3582a8507bd9
 DIST x86-debug-libreoffice-kde-java-6.2.4.2.xd3 796187237 BLAKE2B ab7a0dca2ec127f14b05237a5779b9a9c6fee355d73ba0e61ebc90a7d528ba8d32e1abc86589c04f697ce476e2814557c4d2d73596c6f01cae9563333b7c1e81 SHA512 9e5ab3d39f8d0457ad2440731c8afb3b0c4668c5985c5acba1c8f6fe76ffb9230a4df9babbef71b0a639a8a96111560cb8b79ac576887642a7343238617640be
+DIST x86-debug-libreoffice-kde-java-6.2.5.2.xd3 786182822 BLAKE2B c27b353a2855126d593d5de38a4e5605d4f2afd66b156cb721158f658fcdc4129c95e419eaf0d182017461b7d544c320cecbaac70898188593718b2f5c5924c2 SHA512 4ce9814f4033fa4ca11a1bc6d14b1bffc14eead79610a944e3c5092df4ed285e6400a1669cff4db1fca0fcff526b64d38baeff166788820497619026ce6ff3c8
 EBUILD libreoffice-bin-debug-6.2.4.2.ebuild 2626 BLAKE2B 62ef593013fec0d24717823b361c0d0948aedc1e5bc2c99795d9b1f44f38f6e6de0598beb13342ceac5a7a8f247a981c9e9fefffbb4edd3ffc227aad57d8c632 SHA512 de472a71d20ae953b2a1f7da843c0cf24b25192e49d6f39862ec301734f5169e890c4717da8a280061b98936e7352662b0eb822e6587c18b7405c7a6f26aeb28
+EBUILD libreoffice-bin-debug-6.2.5.2.ebuild 2630 BLAKE2B 63feeb23fa9b3caffa0f0c786b500727f462df3dc5afdbad70fbd94dca5ba97e12766803bc11664837b4cecd96f13f01399540f1b471e6991cb824b4ecf5a4a8 SHA512 0e46b9945d3983b8fc97c60f74d9b9cfbafbcd4bdef0a8d57c2709b797779e4342345b305b40bfc8bdbaf72a018f85569a9f2a8fccae96da6a3f8ee27bee8fb8
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.5.2.ebuild
new file mode 100644
index 000000000000..82776e8e316a
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.2.5.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 d6161ca5f973..65142bf0dbb9 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.2.4.2.tar.xz 103982884 BLAKE2B e1a7228ee94784827a689aa29f1e37f712d5ba9bce1e0f8d4f182b5fa93e5f9ad67e2d71b7f3abd36c1dfd893575679d7181b24ca520ef44ff86d20ec7bd0b45 SHA512 2e0a4fe2a12be7bb38d17e151d5c24f852d838a98f2dabc2f2192d2d7d2866457d69767aa2e0caae0f48a0769998b1ca29d07be07a151478da0c02f70e9c4525
+DIST amd64-bin-libreoffice-6.2.5.2.tar.xz 104233412 BLAKE2B 577d104f966b6c8809246569cdc92c4af5815ba69a9a56ec41e9666f1f45828385f84cd6b611d76d4f6dca5af75d18d735153ea8eb4ca6e5998039e09d308c2a SHA512 784d780099f14ae2285c2c45086d49571b8def5d531c5dd0432c53922ef560c4c9dfbd8f318218b31823faeb8dc3443a1b2da97b90dac0964b54d0c2cd7b26a3
 DIST amd64-bin-libreoffice-gnome-6.2.4.2.xd3 18912626 BLAKE2B 5710b82bed9a0b5db59b3709f6f7bcb54bfbfd4ccaa86f4e84949ccfba0ca71f1d0e8a6b3d9addff1e59e7a35504cb26b3f262d26d38998dd4ec179b33b88d2c SHA512 1acb5ae243ee212b6fd2b0a48aeab56b39f338b574b049ef67e58c703ab0474026853e605a39d8f30fddfca48b961ab7d4fbe40a7a49933dac656af6e84bb2c6
+DIST amd64-bin-libreoffice-gnome-6.2.5.2.xd3 827035 BLAKE2B eb4e8693e0863da1170c8cf28abe336054544e87c4c19862e5de90e068c233ff20d287db88f7bfacb599c010d9926198d7654233f3993981c6a9342e1ddd6645 SHA512 09811b27195733a4d62899491c02f72177a9a3ba14bfe34dcd7e103710d3da0a2d750af2094900168a668f5b336c47e4756e045ecbb19f1bc1792ad5b0ad6b00
 DIST amd64-bin-libreoffice-gnome-java-6.2.4.2.xd3 30448355 BLAKE2B 0d3f07b879b67f9135f8fca9a6c2dfb77c746246347d01052fc808b02b70a13a4b4eb772e0265f0fb35c678b05c0f72a5dd0350ee57178850acfed7eb63cc0e1 SHA512 44e32a43a71f3b3c81f14668a5af97361bf3bc1f1bc9770607e34e33dc0b610d4c1443a32f86a124bc2ef5d0029fbcf6d221e91645adf07fba400201d2e3b6e1
+DIST amd64-bin-libreoffice-gnome-java-6.2.5.2.xd3 29528433 BLAKE2B e8d61fbc5c3b0df1635d9a5f1633884c8090db509ae053e45a9d3c8462737e258584f8badea038218c1af6fa2b8e438afd923d6496207daf9f298b1dcba422cc SHA512 6cd2fb0bf978fe6ba2a5e0b453f63f4443f7042a5f9b1b158aee5c17a634becf1877f3e39a2e689ea65dee95a60c1becda1a381265cff55a32ada5d03104f09a
 DIST amd64-bin-libreoffice-java-6.2.4.2.xd3 29169303 BLAKE2B 70b6756bf9625ad4b6ae5eb1bd3d7f4c965c527f7fa87f2074ff1fe7510c374e93bb07170939b6a08e4d6d68df7d47aea1c4ffb77d93f8f9d7fc51034615b294 SHA512 4118d897800b20b73f414daf594d39ef5b5b0d923d4b2ab54ea26b1346c238ab3d7becff7716e2e88da51d98918bfeb122405c95c3e1db926e389b137fb98dcc
+DIST amd64-bin-libreoffice-java-6.2.5.2.xd3 29397096 BLAKE2B a96bdb8054f340b9ed8cbfb0cac13240787d6cb21babd17be2136e7e1dcd63754bdbb1d346ad00f87c3b90d0540b9ad314adb681f6441e3bf564759cd2fa1142 SHA512 4d557944a8bcae5ede07229ad487585ca9cd1aaf532a9ebe3bd6fdc2720461f760dc54b62ff8898d1a876786797ce2dce0134e7c200778d269c9ff24002e9270
 DIST amd64-bin-libreoffice-kde-6.2.4.2.xd3 19572204 BLAKE2B ccadb3d665cea7e036f92ed813795879df59c32092c09d9e0b2fa11ef4f3c402368f57d3713ab8693e4f0713699d1cd132ca31664eb3309b487c67ee52be6eca SHA512 1c1e40b0b256ffb623ebd5a289c8bec1b65468de0dc0242eb03e37e8894c5cde43b122846698524d4b20804b28ffbc153cab33ef08c61fb0f3f7860ee8b5fec6
+DIST amd64-bin-libreoffice-kde-6.2.5.2.xd3 18176613 BLAKE2B f96688eedad180dd21336a4458f46281a267ab6b0b8c274a9ff6c0f60415c63e2de723d8474781cb91e426c230f54dbc8032133a4a30db048eea59f31279cb5c SHA512 129ee7e6020db5bab4fb50e3a87060e561e598a6a1fc192d3bbe8a3770ff25e66e3e96b1c04a59f56dd72e18c34a94894d8ed82dccef44f332205805b0891f7a
 DIST amd64-bin-libreoffice-kde-java-6.2.4.2.xd3 31004830 BLAKE2B a7084f685d9315f0dc367005fbefbc00f42458e4cf8e6701e7de062d8dc401c28f55b96cecbd315ef8f2fdaabce5288715374f00257552047a78ffcc30db90f1 SHA512 da6e037640ad107d3049142f834d2803821099b03cbee6fef875afbeaf33f701479a528b3a350926f37b59e5787ebe040c4b79daaf9d2ac0d6ec5196af4c584b
+DIST amd64-bin-libreoffice-kde-java-6.2.5.2.xd3 29682018 BLAKE2B be1088deb9ac86c740294279cfab4ba55b3db7a9dd048b35275b323ee2c3d69cf7fb5ea9ae188870f3649abf353ad02af20f93343720c618a02a5135b37ced17 SHA512 da772be63d9195756c4d1468be37dfaf2f245d4259f411913fda58eabbc85041359cf7f689050752efc2c30ab30d35adf2e94bfaefdce1cafc762c52ce7d7b50
 DIST x86-bin-libreoffice-6.2.4.2.tar.xz 106392740 BLAKE2B 8552710a146d18033dc32ee4e24061c1dfdddce14ac9981235bc7067ece4c6a3d3606a85d9077644129d262c107f4ad04dab9d9c82e91d78770c9147c0f6da99 SHA512 1a394eaa3d432a9165e6425b7aa085c94e931f1fee8abfde3478b7d1c281759cce0d531135fe936e55ebb911a308de052110ca851560c7cf6d5f8b256c1ceca1
+DIST x86-bin-libreoffice-6.2.5.2.tar.xz 106672784 BLAKE2B d87da2ed1497b28db4f315c23c98ffbab8877b126d666e521c6ef3702a1459b3d8718e0fda86b9c9afcbcdabb31dd7ecdc0a5a858bb3fbccc9f2e60ec36325a2 SHA512 a9bd4931dc6dbfb36ddbde6d2bb68370f33d1cf747bec8851ed89339e01db6f634989cfc0e8bfebe4be369da50247db9089fe6cf267ccba8fa864d33161a444b
 DIST x86-bin-libreoffice-gnome-6.2.4.2.xd3 17326095 BLAKE2B 3d5596048653f50262f35e892252239b47273443a285d5472e3898b3bf4964cfe5a8698ac46c3bf9edae447993d74c5c1d8336545c2c171040e2f1219e734a8f SHA512 ac89e94e9e64db01c2b358728bdd31054b96efe70f75c200725bf9403250aa58bbedae114f64cd95bce993c8e6f064cd6f2c05461589d23eeeed170d0450552c
+DIST x86-bin-libreoffice-gnome-6.2.5.2.xd3 826042 BLAKE2B 0841b8f411a6c9998253fcc7577a7961c2e7f57171c16261309b3de8279658b24868f35c006e2dbc8ec20d469fd121c0a74eabaae4264d7bfc6a02f71958ecc4 SHA512 42b9a6e009941f2422bf349b45a52912d2012468c3cae7eace956b996b71018bc9073ae3b8fd708360909f8a322465c2c9fcf8f93e9a889b034a730865a9e906
 DIST x86-bin-libreoffice-gnome-java-6.2.4.2.xd3 29605719 BLAKE2B d5a4960599251a92fec1481383d5f5c60229840fbc94cc62051c52a3635bed32d30ebabb4c63172bae0f356fb5b0f7c634f9de89b650fe4cc8dba2bb2b740695 SHA512 c4b8ac5424a27a6e87a914edcb16ba897d7c9b3b6d9899d765b1b2530a4cea27468883456daab32f83a1936a5700f8d726e342e138d2bc80fa85dbd4ecbcdd30
+DIST x86-bin-libreoffice-gnome-java-6.2.5.2.xd3 27157887 BLAKE2B 57ab773fee43927fdf6cd154d3a263417dcbfce54dccdecdd3bf26da4bd663e875f915effbfe0e93b6994a9fecd8eaa072dac44c518e884d77aaa90b9e6868c4 SHA512 53efa82eccb47720b605691d90c9e74b73c705336c4f97ba73d8afabb9093e154979be1a2f3ec5e3485848ca5eb84b62285d027eacf47244709df492ced526b2
 DIST x86-bin-libreoffice-java-6.2.4.2.xd3 25920366 BLAKE2B ffa55133cfc039f306e225968ce953cdc397b1e5aa1ff6c4508887f485c2f73beb82f4ae46586f2af2833a371ee9b7373d0b7405884e355dd1b179ebc0b4a32b SHA512 8d4109bdb5b68787d92869424bb8f87ddec47f360ced68050002562459b99e39f4e925fa96904d92166d431ffb06eb3675cfcea822097ce1e858657dab844ef3
+DIST x86-bin-libreoffice-java-6.2.5.2.xd3 27188472 BLAKE2B 5e01d5fcbb1e4a93a1f08385ecfcab9582dc1c062bce26abcff6ac744e305e4da4e70d28ed7d7c35a0e768cd39857f67bfd168aaef303ffa4843cc4277efdb2b SHA512 44b5489748fb714b2c23e911121ef916eb8c8655408de458ae8ce5d15fcdaff1ab882207ca937115db0214c69b5aade30128d79d7a0de1a6c08702263a34c345
 DIST x86-bin-libreoffice-kde-6.2.4.2.xd3 18283075 BLAKE2B 485b77a94350861c615388d591963aa327783dea382084c2394e13b51712e85ad6d972e118da91dc6a0f65663e6ef72d043c435f34f8f3a6dce548a997a4dfea SHA512 8a987e679a3c078c691f7006dde590cca8f1f3d2a06fe164244da813ac8b1acbd766d271fdf23864871f835602d4d00e2b90e693cdc2da4a0cddba9bc7ce9776
+DIST x86-bin-libreoffice-kde-6.2.5.2.xd3 16337918 BLAKE2B b1bbb4f97f8a78f3904c10dad119b3854c9091749757b3d904733c949aa6c6fd7cb14b794c45e267f42c342a8d32185c6ded95726e7e93fbf092194e4fbd3f3c SHA512 b181b4aa5a483460114e591bec9bec8d6d3c777bbc027b03b4793a6babc46b56fd88888e02fcb4b142178a28d9748c0a0fbc2b5a55c7260dd86f22cb492c7c7e
 DIST x86-bin-libreoffice-kde-java-6.2.4.2.xd3 27890295 BLAKE2B e5d9ade91a15f1474d7cc41216a363ffea712020a6f35af7080ea95400101a3158aca8bdcddac9b910c8dd6a9d454d4e9116fd92b3330fc57950fc421ebdfe60 SHA512 3d82e794770237376293b2048f8e1ca38320e75ebaf3b825a074b00cf0c710a43faa3cee328e310c689af34aa466bec7512cde566bd7cab5d814aebe39c31eba
+DIST x86-bin-libreoffice-kde-java-6.2.5.2.xd3 27572925 BLAKE2B 57a97620414c95bee128fb0afa5c586822d479eb0e9e2915a5f01de4077d6c1f008f47453dc0db2baf03b658c414f02d83cc5891caf84270f132ce69ed5d6bc6 SHA512 6cbd73b1e73afbd98d5a6dc784dea52ad460e74dbf04183864d2b614c85f386ec80ae7f3b727f18f1f5f4551e6c0120105931008fe37870262a4e14443445016
 EBUILD libreoffice-bin-6.2.4.2.ebuild 6804 BLAKE2B dc093bcd6e7ce734d7e5d5bb870cfca42a02c3ffc15d1682e7dd9011a337247ef365660c40a6d9fe2ca8dc89846631ef4990d9510c17738b2ab10c96bd1f0ae3 SHA512 d0af333dea9202e5c08866211859d1168e10fe53c74748df3a2fac642823a17622c42c87c44fcc7ffbe5317d2a29f18bf10ec7a65b06d9c2553336f6e07bd441
+EBUILD libreoffice-bin-6.2.5.2.ebuild 6373 BLAKE2B f948c7001a85b682c43ea27664774a7c8b2990333f9dee7b4acfa1bb003eb2d193d51f695d6d71af97589e04f8ca1d2d27e9f497b5cad83225d5f8c973957153 SHA512 21e8f197ced5a34ba0b4f071ba7d4e1fbbf6c42f9fb0c1c684c131dcc67e4f8c04438a3c2c698b43482938c3d616b91c5a45388f653885363c4e5ad88cab5598
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild
new file mode 100644
index 000000000000..8317169b37ec
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 java-pkg-opt-2 python-single-r1 prefix 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
+	!kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	dev-db/mariadb-connector-c
+"
+
+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_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	use java || \
+		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index cfab4b7b76d3..5e093bcf93ec 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -505,5 +505,5 @@ DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 808102 BLAKE2B 986d
 DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_zu.tar.gz 321326 BLAKE2B 940aa9a872df4b1f88bfcb900daf8fbefc2f8025bd0dbe3bb1df2fe2f10b58be688ddb9a12e70162a1de024abc5f3b100da0a75dcec9957f6326a7de1fa76037 SHA512 fe0f3fa2bdee6889278414f150bbc1a89686122be8de129f59f7c5f5f1291f1ef9aa9748425bfd7dfe63085b5227061c742da818b399cdfdb1b05a4d258318c4
 EBUILD libreoffice-l10n-6.1.5.2.ebuild 3624 BLAKE2B 2b6d4ac738668df01a41adec81827de1b93dcee3ec6f622f89ebcddc3ca2a162c6493a06c635f17cf7a9b69f9c6eb8f61606124640f438db1f5a064c16d09811 SHA512 f4347080c7a16640feb557b566c332901b4090a1b711caafe7e7445d7728bfabe2bf7617ac7047489921384dd601320e32f3ea205d7a4db2c6f510b3d6748e9c
 EBUILD libreoffice-l10n-6.2.4.2.ebuild 3624 BLAKE2B 2b6d4ac738668df01a41adec81827de1b93dcee3ec6f622f89ebcddc3ca2a162c6493a06c635f17cf7a9b69f9c6eb8f61606124640f438db1f5a064c16d09811 SHA512 f4347080c7a16640feb557b566c332901b4090a1b711caafe7e7445d7728bfabe2bf7617ac7047489921384dd601320e32f3ea205d7a4db2c6f510b3d6748e9c
-EBUILD libreoffice-l10n-6.2.5.2.ebuild 3572 BLAKE2B b6fe555b21e26b0d4e6d8634e05147c716e93a9efa1524d5ff8f0c515ee8d484241ae1e1b2df2aa7c5b59b36091935a79c42debb0cd3e34b9fdc60f1d5999729 SHA512 7ab5107914ac7498a581cab25e382dc62160be871026be587ac6886404a22f15b1633cf5ac36acac0d2ce8be00bcb8c38a2a218299527f219224e39de8896a77
+EBUILD libreoffice-l10n-6.2.5.2.ebuild 3626 BLAKE2B 98b23450185353f96f166b2aeb3d2fa741f73b0ac064c8c6e2bb578946520ac7801f2c2d6b7cb15b73ed12fad268fb413440b5c76399391560aab6174a2555a9 SHA512 410c9b184e8e0617b045074fb0de5aa91210b9380423cdb70b84ef83f5500ce1c9ab4d27b0e0592c8ed94e6fb51f3a47a287a45d05e4035eacc5a1e58b69966d
 MISC metadata.xml 369 BLAKE2B 7629064f409fe8ba7f0daa435ff56eaf0870f70b45961c635119725e9a78ca40bbdf77a39e70f83a31103944f579b13db5fb07f8dc9e7ecb77491d36220370e9 SHA512 8cc7592062150a5472a5b8cf4106d0c3fd7270c7e6d0d566852bbc6670a90be2c73e6c04f085e32b41f40dd1adf9800a53a1af8df5cb297c20394c55e3df45c6
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.2.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.5.2.ebuild
index 1713955ef9c8..bcf1dc5f21fd 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.2.5.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.2.5.2.ebuild
@@ -17,7 +17,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index aa029b250a5d..01e2652d3b3f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -19,7 +19,7 @@ DIST libreoffice-help-6.2.4.2.tar.xz 13024208 BLAKE2B e4b6c8e9071ca0786c2679e7a2
 DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a29e1fbc99a9bf76b2bf4cedef8dc61487c9a2036f143501ad7fcd0c056c8b72446305b7a4ca9a719b11200ade5feca35e5e7ea SHA512 14f964161bd827a5846ec667ae1dac80d1485450e172da44010103e31f3872df62595e8b1b1d45c720caac9256d2adaf8f5a0bb80d059d35f1c560b533eb764c
 EBUILD libreoffice-6.1.5.2.ebuild 16963 BLAKE2B 3191a0fea6afc8225d61796f3a78f82540e9aaa67bb4965613c17e110a1fa88afc36f1c7cd9a8f57b631369653d6b4035cc15d085ef5ebbb3f080febba4d3861 SHA512 2232556f0b75e5f24724315fecb409066d976013a70f1689e9714ecc31824411aef345fc6f3897792e43b817dbb3af8d80ac30ea14cd72ba3c873c1998f543c3
 EBUILD libreoffice-6.2.4.2.ebuild 15748 BLAKE2B 218f1fb3458a526d4de0fcda21e904c381603e1e5385851e478ca2005c6a09894155f2d9b058e3f64f51ea85ec454ce8ef5f96dfdf6cc20888a90e9d2d744af2 SHA512 0c5eded04f7df11611d9fca4b8d29d89719136461d224ae4b4a5b11688c883c87fe53d8e79da41f1e7797ade1cb61dc5cecd8705104169cd2882c4c8ad861f83
-EBUILD libreoffice-6.2.5.2.ebuild 15914 BLAKE2B 1ffec4ee6846a10d3a6f3c99ebc0301aaeb5831c582455d984b9dca287c52f5d3f277db3361bbacbdd94bdceb35e38773cabea336a9d9724fa848af3085dd6ba SHA512 e807d95ca3be1153279319aac4274dc0ebb437dcf3865720cb089c5e068a356dbc48a70875338738d2b1da19820702990cb58b8187b39e06095b5efd5d36d16c
+EBUILD libreoffice-6.2.5.2.ebuild 15901 BLAKE2B b0dbacb4863d755c5216472457a3e9e67cea9bee43b3898f9fd404d7d65f25404d6f0e5f463cadbb93d1ef5199c01795bf12cd817aaaed6e869da4719e718749 SHA512 bce2f0939ebb81fedb76d5673de99a498388d94b422efae6b430af48180e820b94af6b59ddf96e62c2fd74a8e5160d6a0a40722115cb6d503167ff9ea06abb3d
 EBUILD libreoffice-6.2.9999.ebuild 15901 BLAKE2B b0dbacb4863d755c5216472457a3e9e67cea9bee43b3898f9fd404d7d65f25404d6f0e5f463cadbb93d1ef5199c01795bf12cd817aaaed6e869da4719e718749 SHA512 bce2f0939ebb81fedb76d5673de99a498388d94b422efae6b430af48180e820b94af6b59ddf96e62c2fd74a8e5160d6a0a40722115cb6d503167ff9ea06abb3d
 EBUILD libreoffice-9999.ebuild 15839 BLAKE2B 47aeba4a7da7cb079733fcd1c0b84257886430a301eee3d61e02a36ba10edb0398256bb6ffe57d73668cb7dabe2f8e1ca3f3fdbcabf30f114735d43b62396ccc SHA512 00f12128e48c840092e77caff86616ba9d6d2e8f192984e51a74d9fb2f6c268644ac0b4d28299fe8726a8965c4f022f754d74e5420832f4acb863779cd599d6c
 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7
diff --git a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
index 53d25e90bc2f..64438bc0c90a 100644
--- a/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.5.2.ebuild
@@ -77,8 +77,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-util/intltool
diff --git a/app-office/moneydance/Manifest b/app-office/moneydance/Manifest
index cff75b57e395..642ca20c428a 100644
--- a/app-office/moneydance/Manifest
+++ b/app-office/moneydance/Manifest
@@ -1,6 +1,7 @@
+AUX moneydance-bin 567 BLAKE2B 4a1f80df1e5e20c08ba95168b680f8e0cdd7413fdc7991b12d40048dde6465db8c4d3a18c7b3f70bb829a2f5d2002258a8e6ccefcc64afbf419633ff948f3e15 SHA512 344e05050f28ea61264899b62f3e14844371ef452b0b84c6146abdecd2b9fc1230102bf2685b6c0649e014048c82ecd5dd7ce3117e65a9a22a2737eb39f4ca9a
 DIST moneydance-2017.10-amd64.tar.gz 132116528 BLAKE2B f5ba44a89944657c6c1380226dc512729825b084783e6d70dd7b2b731411294c7333bae858b2be3d5321e5145230257b325dc2b72a22744a877673c1c934d854 SHA512 175ff470b5fb5c3851eae708cc641777d7bdf1ede40366ccf5a135d6c813c08d9ce32665a2307c3aefa63eeb2206ad0874cb989aa998415abb86184a2b114ce8
 DIST moneydance-2017.10-x86.tar.gz 134860964 BLAKE2B 92181a6c6a81063377823b0fd9ed652036cf1f633c2cab57f19d1dbb18a2542361fc2bafab8852c11b941a24532f662351ea2d05bc928818db24a4cf3cae7112 SHA512 18d9d4ce7b0b65566ac81fea66ba34d66173559ca90ac166cc9b90631400845ae1c9d92ae781a618cacc57cd4f630f079736101d29b66d9c6cee7d32c7c15c22
-DIST moneydance-2019.1-amd64.tar.gz 132469388 BLAKE2B 516ff3af46e23370cf97b7a41e9802f14f5272c36b01080d69f339bdb9ca7de045de35baead8d97a8febece062dcd8b2befecad2744773e9a1c79b9a16b9639a SHA512 a28787dcc10173f4d492ec1bd5a8f17b6592f86c324e57a7e2951a0265825e4f78b620a4aabb4cde94c97860d3aaac8066572882c772d5abfa79c90cd33770ee
+DIST moneydance-2019.3.1880-amd64.tar.gz 134414524 BLAKE2B fa6991b245efb76d9af17611ce5f24c4c77fe171417f41ccdccccbfa0b6795fbcb1c56c072dc7382e85f81ec57302040eb0cb091162964026fd230e6b5b3eecd SHA512 1e0cedb759168123de357cf4f69691ac4bd9868524d012f924d00c8f653a3505d3defe8c79e0c151d2b9163dfa40b551b0cc86fd7da678e841902bab812a1d2c
 EBUILD moneydance-2017.10.ebuild 1503 BLAKE2B 26cde10e7460a69484a3449f288e0a2f55925a55a7e8144650e563a00ed8395c9c95680034878af75195e858389bf30954bc7cfc679ada7a10f2f7081d61412e SHA512 207e71aa55a9f194c5f23d04c6626687c34d5717a80c64a30590623e5396912fd26e874bad4f29b63627800806ab8a3af0685be4854d9cfa27536c270427a268
-EBUILD moneydance-2019.1.ebuild 1264 BLAKE2B dd9a183411e1152df2d38b934c4acde963f5cefdb208a4f9522e68c93daa9b3a1295e1ba698436a29970d41fb0891a21c517822d17339c7409091c2a98170510 SHA512 b3baa1daf9cdc79eb6574b861323247aab78cb44a726d8cd54ff5195f6d5b485c9d89df8e241f676b5a0891429a7a0fdc82462046be7c9b6280e4c24ad69d9e4
+EBUILD moneydance-2019.3.1880.ebuild 1368 BLAKE2B 46bf27fe15c0e9f5a4e1094ae28ad3ff1a613c7b781163b85afab7c81e3145e9659fe0e59c32f2fef12af9415488d63d0e7424c87bceb89bcee67c88f2770238 SHA512 d693047132cc62d4cb9710dd2d92dde3eff331b46b6aaf14b34d792ab3449ee00045205d542824c5e324d7b284587093f9ef01cd211aeec2d7de0155abcb7b46
 MISC metadata.xml 601 BLAKE2B da75b9789bf828531d9a23f3143bf6977af23efdefd4c2d9cf1488c7d3a66a304f202b1cd496fc807cdf52d271f7a50bf3090e1d7d60d427656ab2bdec4f9ce1 SHA512 a77ece9db983b7955d26e760f6d1951cafaafac57c217cd916070a3d477daaea93338a26ff523d87e4ca4227e1ce02d122f5939069caf8c7bbbb3d0fda9d8e6d
diff --git a/app-office/moneydance/files/moneydance-bin b/app-office/moneydance/files/moneydance-bin
new file mode 100644
index 000000000000..1e8089e99bf0
--- /dev/null
+++ b/app-office/moneydance/files/moneydance-bin
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# Options
+JAVA_OPTS="-client -Dawt.useSystemAAFontSettings=gasp -Dawt.useSystemAAFontSettings=on -Xmx2048m"
+MONEYDANCE_LIBS="/usr/share/moneydance/lib"
+
+# Choose JAVA
+set -- /opt/openjdk-bin-11.* /usr/lib*/openjdk-11
+while ! [ -d "${1}" ]; do
+	if [ ${#} -eq 1 ]; then
+		echo "Error: No JAVA 11 runtime found!"
+		exit 1
+	fi
+
+	shift
+done
+JAVA_HOME="${1}"
+
+# Set CLASSPATH
+for MONEYDANCE_JAR in ${MONEYDANCE_LIBS}/*.jar; do
+	CLASSPATH=${CLASSPATH}:${MONEYDANCE_JAR}
+done
+
+# Launch Moneydance
+"${JAVA_HOME}"/bin/java -cp "${CLASSPATH}" ${JAVA_OPTS} Moneydance
diff --git a/app-office/moneydance/moneydance-2019.1.ebuild b/app-office/moneydance/moneydance-2019.3.1880.ebuild
index e6885dce27bd..7b33f4976477 100644
--- a/app-office/moneydance/moneydance-2019.1.ebuild
+++ b/app-office/moneydance/moneydance-2019.3.1880.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit desktop eapi7-ver java-pkg-2 xdg-utils
 
 MY_PN="Moneydance"
-MY_PV="$(ver_cut 1)"
+MY_PV="$(ver_cut 1-2)_$(ver_cut 3)"
 
 DESCRIPTION="A cross-platform personal finance application"
 HOMEPAGE="https://moneydance.com/"
@@ -19,7 +19,6 @@ KEYWORDS="~amd64"
 RDEPEND="|| (
 		>=dev-java/openjdk-bin-11.0
 		>=dev-java/openjdk-11.0
-		>=dev-java/oracle-jdk-bin-11.0
 	)
 "
 
@@ -33,6 +32,8 @@ pkg_nofetch() {
 	elog "Please download ${A} from"
 	elog "https://infinitekind.com/stabledl/${MY_PV}/${MY_PN}_linux_amd64.tar.gz"
 	elog "and place it in your DISTDIR directory."
+	elog ""
+	elog "Please keep in mind, that you have to rename the download to ${P}-amd64.tar.gz."
 }
 
 src_compile() {
@@ -41,9 +42,14 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar lib/*.jar
-	java-pkg_dolauncher moneydance --main "Moneydance" --java_args "-client -Dawt.useSystemAAFontSettings=gasp -Dawt.useSystemAAFontSettings=on -Xmx1024m"
 
-	doicon resources/*.png
+	newbin "${FILESDIR}/moneydance-bin" moneydance
+
+	local iconsizes="32 128 512"
+	for iconsize in ${iconsizes}; do
+		newicon -s ${iconsize} resources/moneydance_icon${iconsize}.png moneydance.png
+	done
+
 	make_desktop_entry "moneydance" "Moneydance" moneydance Office
 }
 
diff --git a/app-office/moneyguru/Manifest b/app-office/moneyguru/Manifest
index 8eb7f5a3c213..6537174b911d 100644
--- a/app-office/moneyguru/Manifest
+++ b/app-office/moneyguru/Manifest
@@ -2,4 +2,4 @@ DIST moneyguru-2.13.1.tar.gz 1665892 BLAKE2B 969286130c5336f4c41ccf0ee3cbfe55a13
 DIST moneyguru-3.0.1.tar.gz 1052191 BLAKE2B 30ea5eaa7b6256a33e98dc590015f563a3d5f6a10ccf26911e397dced79dfffa3b55941900ecf2cf3915ad0055db0c4c95b2f10c0c55e34d972afe32d714a588 SHA512 fe0de1d01340d124f8f385a4713c6748d2d445c653b508ad08303a3fea5192a0d88be9feb4984d19d4608436eb47de830d1c3dc6680d23aeff81107d27dcaf10
 EBUILD moneyguru-2.13.1.ebuild 935 BLAKE2B bdf9de162ec677f59ea38cf215aa9e9da5bc98cf77520a222ada707beae420892ab6bd9e56cb5bb4e2f8aaeb0b79c288b202e1ad30aa2b94947dae7e04544592 SHA512 55db122043e8600f28278e30604c7d89486e1017990d707984ead98f0a2ad9a1be224affa86ae0fb3871aef7c9a41d54601cf9cb52214af098985a64f2d822d5
 EBUILD moneyguru-3.0.1.ebuild 947 BLAKE2B fdc717924608a19e6e7b6763ada7de9952a83cf88a3ad752d5d098b3583dfbbbaf8c716154746dbadef6fddde520189b70d86201138b9f7cd6503184ef6fe7f0 SHA512 6adc59509e5f5cff1b02d7660ce8546a5c4f07b382ce6a1da92a6c3a7081ee4951b1919ab4b2bbfec22f88b047abf07bb5a82d43cdd4336a3f4ef26277fee2e0
-MISC metadata.xml 327 BLAKE2B 7cb8e18dfeab4a344b6ea44fe2c4ec96170dd441abf5714ce5e9bcc85b0a9d04dcbd3a365f2d65bffc9ab374f117f615bbeebe70517f000d20b6f783f876eccc SHA512 b45b8134dce9397258be3f81c6c6328db4a4924b625ea67c2450839f24939efc227adfc45ed7641cac88f23e82f7f1ae5f1056c9a523c3e36b5a25b9d0a5fe80
+MISC metadata.xml 247 BLAKE2B bc448f928ac9504f3c98bda2a3a36cbd66b58dab1fe217479b20d0b8129e9197746542c0d173ada41d7bf197b27af1023bd04aeb78070672b9b465b0a09c5348 SHA512 00e14b701e986d81baeff9a09cf22bc350eac1f2db9e2bdfaa120013c83a3d316c2a0aeffb8828ad7c14a8521df23536e5ae458fea39834de5e9eb65e87b9bed
diff --git a/app-office/moneyguru/metadata.xml b/app-office/moneyguru/metadata.xml
index 1f5b64f0bf09..aedd054b6f89 100644
--- a/app-office/moneyguru/metadata.xml
+++ b/app-office/moneyguru/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vdupras@gentoo.org</email>
-		<name>Virgil Dupras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">hsoft/moneyguru</remote-id>
 	</upstream>