gentoo resync : 02.08.2019

17 files changed, 568 insertions, 60 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index f5f61ec26283..16df5e330173 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index d4626de8c9ac..a0551da2d304 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,9 +1,9 @@
-AUX 50ledger-gentoo-3.1.1.el 166 BLAKE2B f833556da775338829a7dbb288b89f267cbc9723b82fe21a502e96253a132043a12b3737c208f025635cfa8edf8e3d406bc236ad8debf708a66fca3edb162446 SHA512 d5e2450d19d5d24e2db22429fa2ee8d46ae7284c91b1f2ed6eb32a0e6b70e1996f4b2f41812084b0330011d33fbcb2da11bf2d5b9f28a157f4c05d1106c418d5
+AUX 50ledger-gentoo.el 166 BLAKE2B f833556da775338829a7dbb288b89f267cbc9723b82fe21a502e96253a132043a12b3737c208f025635cfa8edf8e3d406bc236ad8debf708a66fca3edb162446 SHA512 d5e2450d19d5d24e2db22429fa2ee8d46ae7284c91b1f2ed6eb32a0e6b70e1996f4b2f41812084b0330011d33fbcb2da11bf2d5b9f28a157f4c05d1106c418d5
 AUX ledger-3.1.1-boost.patch 774 BLAKE2B e201dbf7d7af357081112518cf6b615162802307fd708d58df59ad79f12aaf19c3f2ff4645e025145e6afe6078b48f6df27d4128cd71e12e7605c976a4650aa0 SHA512 7f7eaa69ef377df1e9e449981c446ea52ef1d2311a9d96e325bf067af702f0361b05d70d6d52bdeefc7c9471cb68eceaa6fae313976e9b9676110b4e97198ba8
 AUX ledger-3.1.1-r1-boost-python.patch 368 BLAKE2B c9a07bfdf02908bab8f20ebc9da5d9dc21c9fa4f8ffe626b8cb71e9e7d10f675eb1541dd845681839965ae387c5ae9a3244c877e1660f55be467cb4183079964 SHA512 5a63031fd5567234d9f12bc0fecb2e5b92da813c7e528c8e042d55b86d1c177acea4aabc94b6058fead2e8c4f835cd213b67531018e17ee805d7975fb71b50a7
 DIST de1b48a013b6f4bdf68f7edf333db63a0994ef20.patch 4533 BLAKE2B 39a2ef3b9e6a8e495837376c8a36c9276fbf58bd4ff45a07926e71ca40d65ddb5761e107752247fa2986e63d454e6461bdf0a3bc7bc773db97dcd3027091a841 SHA512 019c862fecb3f3a0682c2f1237ecebec40eafae0b38d6b5d8e56f9829155353569f889dac468ff5b1b2e23f15ae9fe538a0b027f628776f27ea818c12fd1d0b2
 DIST ledger-3.1.1.tar.gz 842364 BLAKE2B 83f9008f6daf4da39ece192388e0231719bc7297d2a911f1209662f57d2963b9ea09a5b6de9450ed29c5973efa47d9d6a250e052c155d9ba742cdb3ee075f341 SHA512 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
 DIST ledger-3.1.2.tar.gz 801112 BLAKE2B 71b907a83fe10857d17de746c0d124572859c9eca237130ebbfa5b730406470a5d31025736e80516feaac7daf14a4edb8b644ed72a0827f9714ac9cb2b79c0fb SHA512 445d9a9c70aa3e59718f8fb75e4110c73f2f476436149fdd456b5fe7b9cee9333c09647080049989599dfac491e5bdd0d143717e58e15989db0fcaad4e5a958d
-EBUILD ledger-3.1.1-r2.ebuild 2831 BLAKE2B 35814c1235e99aaae2a083d95c20a2c97d313d515bcc5fee4a7e3d1ba6b609984f7b1ac1ad3cab41fe01b296cbc93fd7d420ccff6fcf0f4d1bde27d2668f6f54 SHA512 2fea320b118e57575526f83e3f436c4fce0c78e3f73def2e9ea75adf2e692fdd027d97ae5aea014cd3b73e99e389f53931ec9c9dda8fdad81b39f25367ebe9fc
-EBUILD ledger-3.1.2.ebuild 2804 BLAKE2B ae7abcd6646460ac6414f6be0b801d7c32fdafe691fcc58fc67412a7b6a1aed6cff3ddbad6ee1f49cabbb65c65c05b6c88f541e2f0fb111f9df36d793557c427 SHA512 c0382a50c19d701a9cb3c3bd91b9a5f295cd60d723b688639069160d924706e9660791020cc56f973ae7d1d8c8aa23421aed2ef2df6d2e0a3db06aa78858d335
+EBUILD ledger-3.1.1-r2.ebuild 2822 BLAKE2B 02ee45f98407e32c93a1329529282e2350ca5eff73ea8bea55c649e49907ed164a6d2f50544036fc72ae7b60a28018ab46e376a042810c4a738e0b95c8eff144 SHA512 236d8733fd099ef097abd1d87105cf0c2aa5e2ac6a9068edbf851d2bc5c5ff67c591a667381abc352e49652a30f2a1ed8d512df081ef952e080b9c55c00a31a0
+EBUILD ledger-3.1.2.ebuild 2762 BLAKE2B 60d16871738477b0af27b3739927721b12b124e6d7659f382391bc1910e9afbab6ad9f28a9480df2c5465829f5b7c667b8bc546f85c8348d543616814d75f5b0 SHA512 8b4fbc5ffffca3c0000d21c2e70ca787ceef1f00d96ca691c742c7c4dccb52ce616f9d70c50a45eb52cfdc90ed77479cb2ba1d4161f49b0b0427a77ca3dac2ae
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
diff --git a/app-office/ledger/files/50ledger-gentoo-3.1.1.el b/app-office/ledger/files/50ledger-gentoo.el
index 1c2c5bde2f8b..1c2c5bde2f8b 100644
--- a/app-office/ledger/files/50ledger-gentoo-3.1.1.el
+++ b/app-office/ledger/files/50ledger-gentoo.el
diff --git a/app-office/ledger/ledger-3.1.1-r2.ebuild b/app-office/ledger/ledger-3.1.1-r2.ebuild
index 48b69eb0fcda..9bacf38fd693 100644
--- a/app-office/ledger/ledger-3.1.1-r2.ebuild
+++ b/app-office/ledger/ledger-3.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="debug doc emacs python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
 
-SITEFILE=50${PN}-gentoo-${PV}.el
+SITEFILE=50${PN}-gentoo.el
 
 CHECKREQS_MEMORY=8G
 
diff --git a/app-office/ledger/ledger-3.1.2.ebuild b/app-office/ledger/ledger-3.1.2.ebuild
index d027cb0f7359..15695c673914 100644
--- a/app-office/ledger/ledger-3.1.2.ebuild
+++ b/app-office/ledger/ledger-3.1.2.ebuild
@@ -17,7 +17,7 @@ IUSE="debug doc emacs python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
 
-SITEFILE=50${PN}-gentoo-${PV}.el
+SITEFILE=50${PN}-gentoo.el
 
 CHECKREQS_MEMORY=8G
 
@@ -88,7 +88,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_EMACSLISP="$(usex emacs)"
 		-DBUILD_DOCS="$(usex doc)"
 		-DBUILD_WEB_DOCS="$(usex doc)"
 		-DUSE_PYTHON="$(usex python)"
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 93b5efddc479..bba9087f6466 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -336,5 +336,5 @@ DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_zh-CN.tar.gz 807561 BLAKE2B 8a57
 DIST LibreOffice_6.2.5.2_Linux_x86_rpm_langpack_zh-TW.tar.gz 808102 BLAKE2B 986d55b6a905374e316683e2d041edde1a8f9ca341a880b499a65f4c3664d85f621d5d55b6615656201415f828ee265208abe1504e98105ca8bdd508aa90195c SHA512 b6a98834037c0f7e7d5495d9836a26452fa5542b806d81da611560ebd12234fbe98eed521c7b73515006514cf9207c39214a5124987c1c8d6c426f18db6247d2
 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.5.2.ebuild 3624 BLAKE2B 2b6d4ac738668df01a41adec81827de1b93dcee3ec6f622f89ebcddc3ca2a162c6493a06c635f17cf7a9b69f9c6eb8f61606124640f438db1f5a064c16d09811 SHA512 f4347080c7a16640feb557b566c332901b4090a1b711caafe7e7445d7728bfabe2bf7617ac7047489921384dd601320e32f3ea205d7a4db2c6f510b3d6748e9c
+EBUILD libreoffice-l10n-6.2.5.2.ebuild 3623 BLAKE2B 0b1397d1137da64bdf892306c437039f3f811339a06c2fc3914434180381798bc0ee4f1c00f429139afad91dfc4386cb0f9e306ab47ef888d472e753052a69f5 SHA512 832c0b42f2c30a2c03198d7d2ad4d1af8b1e6d08ac0e17b49005c9181a42aae6830cd30b7d469f89d553544ccb0dff3cba4f4886dab405f04410ee4e8a85f105
 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 8712656dd28c..d1f50c37c2be 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="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+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 4a50d23a3dba..dfddf96a9a3d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,5 +17,6 @@ DIST libreoffice-help-6.2.5.2.tar.xz 13023680 BLAKE2B f1f3a03104c1270e59f2b9130a
 EBUILD libreoffice-6.1.5.2.ebuild 16963 BLAKE2B 3191a0fea6afc8225d61796f3a78f82540e9aaa67bb4965613c17e110a1fa88afc36f1c7cd9a8f57b631369653d6b4035cc15d085ef5ebbb3f080febba4d3861 SHA512 2232556f0b75e5f24724315fecb409066d976013a70f1689e9714ecc31824411aef345fc6f3897792e43b817dbb3af8d80ac30ea14cd72ba3c873c1998f543c3
 EBUILD libreoffice-6.2.5.2.ebuild 15899 BLAKE2B 6b9b2d2796c8a5b0a95d119c5116c8a869ba6de5d02545c9eaa62de4707676fb26f1b110f780a0cb974f7ef0c615b478def2c5831e8f5ce80bd86a7ed3431651 SHA512 84616ca7a99ef94806c51641d3fa9aaf003ac519d4ad931de3bf3dd9f2d1317fda9237fd027fe51e658fb3b41545d7bfc88acac23b3caeef11735c8b45394e97
 EBUILD libreoffice-6.2.9999.ebuild 15817 BLAKE2B 0bd24da75eb00a7b82df6cec5e0ded34980bda74e92a8c524819e17da1246d26bdd7ff8200b223ab23cc1afba042185bfe69ca958967c2a4d06691ee5dce3d3b SHA512 dedfd7dffafb0212f6e0a87bdeb92c038364869e56a540a8758d9d18ec80c161513d077a822da572d37ac13ceca8f8d831727191064b5b7718d5ec1f26cbcb5e
-EBUILD libreoffice-9999.ebuild 15755 BLAKE2B 667fdbcd6599d0ead87ef811de870a8eefbaefdc9a24acbdf1442e2a2bd17fa22e719868a0e417b94aae589c1efe4f4de3940aab497985a11a4213c35d13f641 SHA512 f73f8516db7c2dd5f521517853a4a34d9fbc1f1832fec0586fdee1f7f844cff46d4add1e35c90001b7f05d71eb8aacf9853b79aa0b2ea04fde9218bd88e210b6
+EBUILD libreoffice-6.3.9999.ebuild 15757 BLAKE2B 6a557049add2f9762f113d918ffe1b001e8223f0ac0eb65d3a99b92ea4aada2b2e2fe22cc13acbe11adde214c0d6dab67d2c947cb629a3554c2d0d4e3b34dae8 SHA512 8f0e169074121c406b45e91f9cc915a0bdd39191083e253079ea2790635ade20f98ca5babd81e1d4345e92945c8685e2826f8825fec379dafe6a973b5158d2f3
+EBUILD libreoffice-9999.ebuild 15756 BLAKE2B 2f6a4c47de4f248e75281e2d4701d98a2ee2963eaf0b12cbdb6785896439661b4ae0a30335f1395d0cc140606bdbf4afa16e49c55da4312d42d481bbf085dab3 SHA512 4666c2742cd25e26d5a2d8f78b3ac4f656d216b41f3898e46f96b9c523ed95cdfa6fcd7a511461596ca192ac733451cf760c9a9d0e0f94169846a4d046fc76f0
 MISC metadata.xml 1086 BLAKE2B 486defe600d5a74151756ff486e6eca7d529491dfc8db061c6589dc122d9c47e97f8301f28cb86b566ba69e578b9ae6d1e5dae2ca44972e322ccdb1e829aea94 SHA512 c29b3763e187455edc966fb2fdd85cd22faaa5c58b0dbdafc80c9c0ae8ea8400c189723778a86d108869d8891d9d0db5e1e7de931303737178c1e1f084d6f8c7
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
new file mode 100644
index 000000000000..d361f06275f8
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -0,0 +1,547 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+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.2
+	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
+	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	gtk2? (
+		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
+	)
+	ldap? ( net-nds/openldap )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	>=dev-util/mdds-1.4.1:1=
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!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:* )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-gtk3-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-report-builder
+		--disable-vlc
+		--with-build-version="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde kde5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 01399e679eb3..f2a6dec770c8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -109,7 +109,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/libwps-0.4
 	app-text/mythes
 	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
+	>=dev-cpp/libcmis-0.5.2
 	dev-db/unixODBC
 	dev-lang/perl
 	dev-libs/boost:=[nls]
@@ -440,7 +440,7 @@ src_configure() {
 		$(use_enable gstreamer gstreamer-1-0)
 		$(use_enable gtk gtk3)
 		$(use_enable gtk2 gtk)
-		$(use_enable kde kde5)
+		$(use_enable kde kf5)
 		$(use_enable kde qt5)
 		$(use_enable ldap)
 		$(use_enable odk)
diff --git a/app-office/moneyguru/Manifest b/app-office/moneyguru/Manifest
index 6537174b911d..289aa9b925a8 100644
--- a/app-office/moneyguru/Manifest
+++ b/app-office/moneyguru/Manifest
@@ -1,5 +1,5 @@
 DIST moneyguru-2.13.1.tar.gz 1665892 BLAKE2B 969286130c5336f4c41ccf0ee3cbfe55a13560f753e137ff5370184c5aff3e038995c79ad48620a5653552406ea6fb56d356a209cd36774751db4f8e3777354c SHA512 9544a2fe17d0c1d4a6f1ee6c52c79e66ca76da6a6ac35067f1961fe2b44a8efe20173ee5932a91adeeebcb0a522b544df11ad388cb4c453a0641060d75f2a17c
 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
+EBUILD moneyguru-2.13.1-r1.ebuild 998 BLAKE2B b5aa1e992bbab0a47e35d350b46d1b78a46f24a18b5c9b27af9e326ece5cdce5940cc77034d49c44e514af359416519ec7ce08028ea12d4f86e1a5c7a89852bb SHA512 11db20199ffe284d4c6e67376e4eb232e4f96daa341767c4e6f96daea183947b83183f94844ed21acba19f74b5db7156be4e54167b4bbbdf9c2898bcdc24663a
+EBUILD moneyguru-3.0.1-r1.ebuild 1010 BLAKE2B 3fbc44ef38910ec8f0c0d7696773ed1192aafd0fff068d9ce15d32ae83d43c436e38d735d523424a488402889981ed04f668491846b75a7c80cc92c3f3e65687 SHA512 8d1ed36f39ff8dd1c0f491d3714d8619fb579c522fba86be7bd73eaf0d9a075019e87ba1bc6c231b51e0701ef3aa138fdf6ac5b0473832bdeecacde4037bf28a
 MISC metadata.xml 247 BLAKE2B bc448f928ac9504f3c98bda2a3a36cbd66b58dab1fe217479b20d0b8129e9197746542c0d173ada41d7bf197b27af1023bd04aeb78070672b9b465b0a09c5348 SHA512 00e14b701e986d81baeff9a09cf22bc350eac1f2db9e2bdfaa120013c83a3d316c2a0aeffb8828ad7c14a8521df23536e5ae458fea39834de5e9eb65e87b9bed
diff --git a/app-office/moneyguru/moneyguru-2.13.1.ebuild b/app-office/moneyguru/moneyguru-2.13.1-r1.ebuild
index 0b353762ff87..56dae2b78248 100644
--- a/app-office/moneyguru/moneyguru-2.13.1.ebuild
+++ b/app-office/moneyguru/moneyguru-2.13.1-r1.ebuild
@@ -15,6 +15,8 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	dev-db/sqlite:3
diff --git a/app-office/moneyguru/moneyguru-3.0.1.ebuild b/app-office/moneyguru/moneyguru-3.0.1-r1.ebuild
index 6761c2c98dc8..b311cf29be2e 100644
--- a/app-office/moneyguru/moneyguru-3.0.1.ebuild
+++ b/app-office/moneyguru/moneyguru-3.0.1-r1.ebuild
@@ -15,6 +15,8 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	dev-db/sqlite:3
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index f812b96eeb44..5ab777ae2cd4 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,4 +1,4 @@
 AUX 0001-fix-build-with-libical-version-3.patch 2947 BLAKE2B 240a87ca1ca6d383a7a31724a1dc32dc4266210d883fc0e3d327238451b70abf2f6b51f05a0b4c8b167ebad3a200759b1f9c133e20eddc68310fa79b5dfbac39 SHA512 4f46c99ee3354861d2dca34b9a87bdacc8cd9ad0ad935a364b45b850c08b461c32550bb4df185b66c3963c12f8171ba700c46c263baf92ded8eabc2476bb8cc0
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1623 BLAKE2B e88df94b15e5f1967980f6c219a6db9cc27997ea84e0d77a2ed2d77fe268300662d2c5942261254aa3f5ca60abf109cff5c0230a3262f64a709a3e6a9571c17a SHA512 084f907144c044ef03d2bf8e955316cbc240f3b3979f763074f0d9855aec3da6e789e7573a6a8583156d7062c17a685747608b402bcee1a8637a98ae37178d75
+EBUILD orage-4.12.1-r1.ebuild 1610 BLAKE2B d236b513cd02b4d3b7b4f48eddd4b7f4ea3f1d805ffcdd0608d67ddaa65a38c26e5af4419b0a9c181ab3415db9bdf7be74c96c3af6a819eeb82e5138d0443820 SHA512 3d3147b6ea687b690c1c9122e511eb9f4ef99b3bf67da962b08a081a69f4d098939e0bc863d81a65de79c9224c126496e9143889ab2e53802f0dd3299121f25a
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1-r1.ebuild b/app-office/orage/orage-4.12.1-r1.ebuild
index 9dcf63abcbc6..fc906148f933 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb +clock-panel-plugin dbus libnotify"
 
 RDEPEND=">=dev-libs/libical-0.48:=
diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
index c66432fcd4ab..a10e291ab3b6 100644
--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@@ -1,6 +1,4 @@
 AUX timeout.patch 460 BLAKE2B 66cb2918b2ad85cb987ecae492626a0ca06344cac4e9fab1f6a141bcb7822356936439e2239ac586aed8a163e297a5b563e51d382e372c2435256933a4ca3612 SHA512 00ccee1c2040149432565abf4cc0bc8966801202a88c75f246d4b4c986dd43288f30045d4e966c973efa946532eec1f07a6bdff0b9307bd9c12475c9309f3fa5
-DIST unoconv-0.7.tar.gz 96151 BLAKE2B dcdb797728db36c33be9aff447a28dddc8918fb3a496fd718d6dd9ec22a49c395ddaf0130b99aa09d8ed9b2516795c1aaeb58fe8d906bb004a2192eae0df1fab SHA512 3b0837e11f22733e0fbef93dc6aeabd0e2d3d59b6c35a6f7b29b86506a5842bcbffb3e889864d6e14c1e53dd306354690a699257fe60f36ce1d4455ab52b5df7
 DIST unoconv-0.8.2.tar.gz 104072 BLAKE2B 1ac16159f939a06cc75f3ff23f5aa7f1c4d49a41d4cce5e9c5866714ef1b3b969f94c074d36fff19d6af22375d5598033fb69761a09d3e60b81d794841c0e0d8 SHA512 cd6a4d06559895c0aebb5fda51ca86928474dd0ca0aa908e81762643186c29cf8436c889eedbb18bc74ed6016414d1aa831cd034614244d5aae677a6b4cdd4c9
-EBUILD unoconv-0.7.ebuild 801 BLAKE2B 37c24065cd2442146aaf9158d7a5ad97f69bf2d505004e78befb7849f019c2f5ed6b672e9b252421a6179d68a4c8b3508e99ef50a0bdb784186fe17e04577cce SHA512 3ae20ac3790422a4514539768590691471579c2d8dbd94c4cf8d45c2a01525f0a9032f198eb187904b605a24fb6ec5c9ab7621d8980583bc430060b00fea801f
 EBUILD unoconv-0.8.2.ebuild 815 BLAKE2B e0d502ad629f97922abde433879164f35da2a4fbfd5e9668f24841f80cc706bdd1e04b7a8f916fd13e4375e1344c8d3513043818b29bc8ce2ff04bfa6a6ee941 SHA512 a80a29022b5dd421720ac9100889e6d1959727bad1c09f19fafa81bd85122bab482873aaafd2153a20df700e50a87b995e87ea62d729da252e37333e1293ef82
 MISC metadata.xml 429 BLAKE2B c863daa05c0d7d265b60a04e0b1336067296b3854c83aa2c08891bbfe0d3fd45971312b6385b50c7ccb47676b65e97afee953a675176643c4bde348a6a3f0162 SHA512 3875bd4f015c8ffc902a3aedf042cd46cbe86f4ef6dfd1a493d3d7c171bf12248763e64d1f448800fa571157d3e5adac0aa191c9ad40667762ed17eadf3840ed
diff --git a/app-office/unoconv/unoconv-0.7.ebuild b/app-office/unoconv/unoconv-0.7.ebuild
deleted file mode 100644
index 214e7b814565..000000000000
--- a/app-office/unoconv/unoconv-0.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit eutils python-single-r1
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="Convert between document formats supported by Libreoffice"
-HOMEPAGE="http://dag.wieers.com/home-made/unoconv/"
-SRC_URI="https://github.com/dagwieers/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	!app-text/odt2txt
-	virtual/ooo
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/timeout.patch"
-	python_fix_shebang .
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake -j1 doc-install install install-links DESTDIR="${D}" || die
-
-	dodoc ChangeLog CHANGELOG.md README.adoc || die
-}