gentoo resync : 09.03.2018

5 files changed, 18 insertions, 574 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 09075e24974d..6c03fa093c69 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -11,17 +11,13 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
-DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9
-DIST libreoffice-6.0.1.1.tar.xz 203420780 BLAKE2B 80478e0627843abcf61c067592f3220f83ae43123d95dcab82197389f538f843001a6fabdc0d67e3cbca734cf68f2effdc09fa7d15e7b49c719f26d9ebf70791 SHA512 dc9dbef56a5c1df0ac0a4418a42e9200fe1a2e52d3708ad9d86ad1b35171c258fa9a88a4427992aeae83f5e0f22613cf885f068c99e76e5fe376888f4edf7855
 DIST libreoffice-6.0.2.1-patchset-01.tar.xz 33752 BLAKE2B 0b5c5400332bb4e99076794c6bbee80ee6f16d350bbb5232b3b328ea52a2b9af3d0e6f2ccaddd4e9f8519a9d06585dd8a1f37b4b993cb3a83ec13585c9a712cf SHA512 d05f12ad773b67324d7ca10f005f7211013e90b0a689e943adebf89c5050c8e920269ee5b9ec9e275b4634430b964e2de9a77a980daa18cfa55b18e94fabebf0
 DIST libreoffice-6.0.2.1.tar.xz 203783632 BLAKE2B 5a4128d6a7caa9571ddf7b37e77a65b05867738953299b0aef006a704a1d29140f020a9d9a275b86a3bf54083be2c1f15e20b7286a088b1ab4e04d7482389e93 SHA512 cb477391d1d3af544d084820d1bb51edeb553b3792ec31889ac1b2c979c311aeb02f810a2e71f3b7d23990cd9335c2a06fc562913538fc700a4df6630a04e3de
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
-DIST libreoffice-help-6.0.1.1.tar.xz 2972872 BLAKE2B fed3b8182a9459453a71c0cf76b53220081b33bf4a5f88ef603b39101a19a80f4545033c5e2f817c973d0edfdca48c954249761246d53c1eea798a5059ee2800 SHA512 bbebc878b25f80642c6ebd961e8531cf4f1379cc409a63391ca731e83e71e4e83e2a7ef6ae00b56812a8a4ae2c5de5ea5465aba70b357850b7b9c5f672521336
 DIST libreoffice-help-6.0.2.1.tar.xz 2994936 BLAKE2B 69660e50ac871aa890cb5567ac1ebdf4ea9a7ff724b0f86bb44cf29dd475fc35bc9192068a5a8cbaebd1b11042a14d55fa39ecd270e2b0737ed57fe13621d599 SHA512 1e0b3a22bfa36288538cdb420780fe7c0eca59482606f36aa197dd5c0eed1c81d6214e872a3c1b968306300888e959f2d66deded6f491b2c4585164806b06b27
 EBUILD libreoffice-5.4.5.1.ebuild 17452 BLAKE2B 8086f686812755e1166afd3b1fcba1963815423f8f6919a6e0b769edd2d527be103204309d5e2d451ca3cbf92e1e7e7817188a2cadfa9d29daf20f3371248d81 SHA512 cb41bdce635bd4d6a291bb2618e9264cfa4430c6113be9c41936386d1b296bc4c668165b39df4183a4483a438b7cbcd3988ce2e0e63326d1aca702ca5c51f6d7
-EBUILD libreoffice-6.0.1.1.ebuild 16494 BLAKE2B f2e4e28c9edd29f92cfd190c0a09106ecbaa3a25e7a4fc37740f418184bb2c36712219b23f016e58c65b5bb91b5af14e08649cb8c5724a98ba6e0e15c914f094 SHA512 31b9d824c78f9fa635ee2727c45c54be57170787ba28013a86694caf50996eca8d184a1eae17b3fb311315a06125f4022e1d54dda367e3f414f868e199db3016
-EBUILD libreoffice-6.0.2.1.ebuild 16504 BLAKE2B 9797f7340d54bcd687099c30a60ce70d028916cb870ca82686665ac650ca5b9bc47eb8ecbaa3fe927868961d9c0422b6552cab28906b6a356d77f63a0569a060 SHA512 caf7e0d07793b547a101629627181809d135b261ff6800083a5b997c967a5496160d4abb3604cb88101631875be8a3e2b6bb4af610df44c5bcf85cbe4dd106a7
-EBUILD libreoffice-6.0.9999.ebuild 16504 BLAKE2B 9797f7340d54bcd687099c30a60ce70d028916cb870ca82686665ac650ca5b9bc47eb8ecbaa3fe927868961d9c0422b6552cab28906b6a356d77f63a0569a060 SHA512 caf7e0d07793b547a101629627181809d135b261ff6800083a5b997c967a5496160d4abb3604cb88101631875be8a3e2b6bb4af610df44c5bcf85cbe4dd106a7
-EBUILD libreoffice-9999.ebuild 16406 BLAKE2B 0e218d60c2d4b77b4369bf4d6838100f9afe8ee880df0e81f07cf23ab1ebf32c059716ee7f57594868b673d01c6ec6238a79c2293b8252162cf99f593d5d4a92 SHA512 94eb4faf986d7b7390006bd56fc6d11994ba241d50fb2bb3f6e91ca77e6130d862c5fbe14e50897f13af61476b756b2d7269243d41965cb5703dcba8dd2eb265
+EBUILD libreoffice-6.0.2.1.ebuild 16675 BLAKE2B 513ded64b7d65310733b5f638505e02873f73c16705589813a2e45ad89e083f5c4457cebffbbca15f2c6e5d164d77890d3eb912fba16b816d2d33e8a0f300ef3 SHA512 3982d6ce04fab30f13a2625f7c9cec941855667489e669ea1d6623233b9d369aa014afad7b7c85eb888e3e31165be202c8cdc1d7e4c80980a75532dd41ded618
+EBUILD libreoffice-6.0.9999.ebuild 16675 BLAKE2B 513ded64b7d65310733b5f638505e02873f73c16705589813a2e45ad89e083f5c4457cebffbbca15f2c6e5d164d77890d3eb912fba16b816d2d33e8a0f300ef3 SHA512 3982d6ce04fab30f13a2625f7c9cec941855667489e669ea1d6623233b9d369aa014afad7b7c85eb888e3e31165be202c8cdc1d7e4c80980a75532dd41ded618
+EBUILD libreoffice-9999.ebuild 16577 BLAKE2B 73117bb96912763f023be3aaabd418c01c270d358e84e4558d3f116508805410f1ddc0f67220327ef7b87b3846637fc8f94299955e37caed2f33489783a651b6 SHA512 07fd7e5ebe3470ae014a1fd31b3c436472e9dcd9332fbc87bdbd559e0c5cb1129d814d4d2e99ec97de7543f8bad43cd586c89e060c7fb60c7f7824ceb74f20ce
 MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323
diff --git a/app-office/libreoffice/libreoffice-6.0.1.1.ebuild b/app-office/libreoffice/libreoffice-6.0.1.1.ebuild
deleted file mode 100644
index 73e251cb02ea..000000000000
--- a/app-office/libreoffice/libreoffice-6.0.1.1.ebuild
+++ /dev/null
@@ -1,567 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# 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/${PV:0:5}/
-	https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-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 [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${P}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${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="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive
-gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-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/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.13*
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	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
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
-	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
-		x11-libs/gtk+:3
-	)
-	gtk2? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	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
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/oxygen-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.2.3:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	kde? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-
-	# gtk3-kde5 vcl plugin backported from master
-	"${WORKDIR}"/${PATCHSET/.tar.xz/}
-)
-
-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
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${PV/.9999}
-		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		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
-
-	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" "${S}/icon-themes/galaxy/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
-
-	# 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-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-online-update
-		--disable-pdfium
-		--disable-report-builder
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
-		--with-build-version="Gentoo official package"
-		--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-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-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 gtk3-kde5)
-		$(use_enable kde qt5)
-		$(use_enable mysql ext-mariadb-connector)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable vlc)
-		$(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 mysql system-mysql-cppconn)
-		$(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
-
-	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
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	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
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.0.2.1.ebuild b/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
index 73cd46b4e1a4..b5671c6317c8 100644
--- a/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.2.1.ebuild
@@ -312,6 +312,11 @@ src_unpack() {
 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
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 73cd46b4e1a4..b5671c6317c8 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -312,6 +312,11 @@ src_unpack() {
 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
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index eca7b36b89aa..ec4bf5552b68 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -310,6 +310,11 @@ src_unpack() {
 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