gentoo resync : 13.06.2020

3 files changed, 2 insertions, 267 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index c31babaaed9a..526133c86aaa 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,28 +1,15 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
-DIST amd64-bin-libreoffice-6.3.4.2-r1.tar.xz 120405708 BLAKE2B 0395c234ab0197cc4c80b1164a98d9638ac35703c195a56152b1cbca43eb4f49b6180d264ae9ee3c1cdf12e711db0d4e23f7dc7d919e74cb8e7d6bbe5d18f778 SHA512 c22669ae2e93bdcef6b1b6bb4b1aac9a17ecf6aceb3cc249e9f8925e18244185c03d5e420457bba8506628b6b997858e132012807fde4c73c62c84590c972872
 DIST amd64-bin-libreoffice-6.4.3.2.tar.xz 113273468 BLAKE2B b32633570226dcc79afef682bc9cd99e7e6fc7c29361d2ed42b177444318a3a1ef53e6f001515e9602304569e6d164644f74e69095e4050281eedb7106e02576 SHA512 94c597f096053dd5340e63e21778a36892c10545779f63cd9123e2d8b50ef27979b6cfe68c0954de17c706b8adade834b7361a370b6b0df367b2971b9d604770
-DIST amd64-bin-libreoffice-gnome-6.3.4.2-r1.xd3 1045524 BLAKE2B 22879632b95de6b39887c4bd8066685c86d1993e0b36e079e8d7582bb53a2338f6e07f0743bcb11b384099676e9df7b0ee61d1943e172b43dab8b4ab409034b9 SHA512 8d4fec241583782e14abc832175c11199d27400f9f3f876c7d31be89dbdf6e346a9d38049594657726368d40d5d80d8e2b96c30a6b971f24a98288abd032310b
 DIST amd64-bin-libreoffice-gnome-6.4.3.2.xd3 1223025 BLAKE2B 60a826223df7190e23dad0cad2a5f46acc80590dc53ddbbb44725e8b2011ecd687c3d05db112c5e769f0f7962f68c8281cc25822f3b806e593cc640670101e85 SHA512 9a087dea29278eb14c6d121370b9803b9232b6ed6ce10d236fa7c5d6a326a0ac3eacf52f1dd488198449fd7ba7728e7e92627cfb67924406d3ec557ac0268522
-DIST amd64-bin-libreoffice-gnome-java-6.3.4.2-r1.xd3 28708504 BLAKE2B d804206438db8f62dc8b60f0a5ac454812188da276e62364f42bc7f80035958f10e99af8f22088ab3d8ad28fa87581a722b6c167aa7e4382ba644770c6278af1 SHA512 3130d2db027980dcf4ca06ee54c9957006acb5978d9da243722f9ec92616ecb3cc9c00639623c0a4125d95fb7cae4d813a689cddd3e0e7eb7136c7ec6f8f8417
 DIST amd64-bin-libreoffice-gnome-java-6.4.3.2.xd3 27598984 BLAKE2B e6f20918bb3e7355df26d4f212d1e1e90f73fd79e5aad1308403bdd11a9ef3318d244c2a78216a22eba619ed2f4c6b42273bfe064b14045d5ba6cbd0fecf44ba SHA512 377e27ee97ed15ad7963d3f4ae6c22bad24dca52f3552e8a557d30bb81099e9487b0a803fedf41a5254a998d17f401f723774f3e5a0d3fe0b386f76296d582e8
-DIST amd64-bin-libreoffice-java-6.3.4.2-r1.xd3 28563471 BLAKE2B 548eb7147726909020fb7f1b063110c54c1bae5f6403ac4dde81125c1591b527c11f1fe0f86d46779d0ca8ffb9e2c2c9802f9dfaef113b2067482d970f80c89d SHA512 e9882ff68ae93cd4c64dd790b288bc4c54f16d26c8f78507452cf46e1ec12c0d30bd3c875973f5ebf816bc57529e71b4495363f2ad5e1b33a4c3e01672d9abe8
 DIST amd64-bin-libreoffice-java-6.4.3.2.xd3 27479788 BLAKE2B 2d4c33e39eb99a43c1aee46d1e78739918228833d3868457c5e64211fb4cba21fe3c2432fb9cf6f164bf060141f68c8cb986dfe1f1093de6a6b429a63e5425b0 SHA512 f991e5125efe64500dfeb30cf145f85e61460cfb133990f7b7662d5bb281e9b152b7a62a04a2671240b015cd61064f7c537260ad69cd386bc832e02235890098
-DIST amd64-bin-libreoffice-kde-6.3.4.2-r1.xd3 17993514 BLAKE2B 773b1051efc1d4ee0c3cd7f87c8e08ae62a66dc1410be10e842c06b7ce3fb371bfccd6e5b80a9640e063afcc6f72175fb075dcf1657a89b8cb95ace13d6618d9 SHA512 c72409dfbc88bc5864d7b70a101212aefc75ed037b896fb761a5a62460d7d46567401284caf5d518044d0ea306ecded89bc6e1f86d96dda6a97b6ee78ca6a265
 DIST amd64-bin-libreoffice-kde-6.4.3.2.xd3 17773121 BLAKE2B b606a90277eacfc8a7683edad75027142ae9348292cb72e82836ce0686c4ddabb78752e3e93eb994d1967fde77d7f7dc0c73a6b6199b8abc230d7ca39fd5a4d9 SHA512 ae29d2975d88fe14e0518989218c3e05ca722073ed3de8f8d2ee18d30c6a49ea8f9aaf58d2f5ffdb52a175361108b62ad543e4e1a283bfc968b518cdd191c628
-DIST amd64-bin-libreoffice-kde-java-6.3.4.2-r1.xd3 28570032 BLAKE2B 7f2e117bd82c315f984dfb4bfadf25e5b5bca1a6b8bfe47cdb8ef6fa30dfdc01ae4a29edf9b2750b28bbd7648c93bf84aa273034581afeb48b16764fa511d11e SHA512 ba36687555e7ad863a9b4a385f7689506dd5e567a77a61560792aa278ce77d30ff02ae134c1b09dcc1068335bb008a29e24175ba79bd38fac273b626e713ddeb
 DIST amd64-bin-libreoffice-kde-java-6.4.3.2.xd3 27844140 BLAKE2B 4ecb445fab0600a56927001d5994584c230ff3c4c467301e235e1905ed29661b0467459af70384e063873c8a824565d902fb07282a53894be115d90d68c68bdf SHA512 9e459cee94554aad8898042c0f14465889aee83a11e100e7b3f233c2d6d9d5a201f52e825d8fe1ecbadbd0c8f0155c28870aa6e517d543d3ba3d3c4185c95704
-DIST x86-bin-libreoffice-6.3.4.2-r1.tar.xz 122245316 BLAKE2B 0a61ff884bd78b57bff1c120d52728d3a3d9c13c21620b6b324defbb3043420ce52eb3a52e4a582228518d467857d710d4d290b3e5a1a12c8be10ca3a0d73a2f SHA512 4c705bbba757c370c6b21c0381d22f7719e426bdc8dbab435f1abef14732144af48a77628dcadd414af6bea566917b9c526dafd62ac0b7d1e84ce50616b9f216
 DIST x86-bin-libreoffice-6.4.3.2.tar.xz 115234220 BLAKE2B 88eba1138e1cbc6fbf4ec63d5b47215aad89ffa72318633c770e5adbf4c2c2d6e36d4868bec0789795dfc23eb2ee140dbc7224f2c1bd22bd82e22be89c44375a SHA512 1526c94a8d9c49639b6d888f283624c87a43d9c66add0d7971eebfa92e9c922dc4c752a49af7c0c3a7ec7e6b96bc38eadd7a29a4eda24fd3c7b617b27dcb609b
-DIST x86-bin-libreoffice-gnome-6.3.4.2-r1.xd3 1043556 BLAKE2B dfac5bc6503d050411980bda03f281f74608abe304a22d20fdc9df6ec13cd5700e55007f69f9884d78acb15f066582fb887b9723421bb3e4789953137d13eca8 SHA512 3b5c88c3248f0faad9b4cf223861a63c24ae951f84ce4c73f2838895e17c9094fa91e24dff79a95f34c4ff25fb8ec3d90ca59b07ca3ace7146d19689da70b9d1
 DIST x86-bin-libreoffice-gnome-6.4.3.2.xd3 1225517 BLAKE2B b61fa6a5b51eba1f260d16c9bf2cf0d08d3734dc20a11e44e2730dfb8d62b42d59ba4d8708ffdaea8005fd94a852b3c2e7391d859e2c706275e5a7a067f982b9 SHA512 b94ca1f1038285bb8604f685433904f3c186dd6e1c707be9b806153c68fd29aa87601cda0a5d0e77911f67a344815a7e7d255091466620ca9a21a1d606d8c0eb
-DIST x86-bin-libreoffice-gnome-java-6.3.4.2-r1.xd3 27040719 BLAKE2B c29f8c84dfd59344b0bec981f27e08e77fc1ea0c138fb9461579a40ace2dd8e985bf23103ca19183577057946fad8494401858d4df7eacc01d5051ee323d52c4 SHA512 44888d46157e31a95f7289aab6ae8bc6f03ff35de6cde7fa06de02844b031d55fac4779de608e03ce80af891261fd6f12f36628028bcf320cf8dfdc7b6cc4184
 DIST x86-bin-libreoffice-gnome-java-6.4.3.2.xd3 25224776 BLAKE2B 5fa64d26595a69ec514517f4f9429d697319f99a5b3765908a5ef53969023b70fa76c42401e3abfb0229e233f81a111751bdf774629a2eb43054c89b071d29e8 SHA512 9cd1fb2a0b433ff98b515989bfa9fc0f5d8d502c2f3ddab8bf3e9e22ae7833bed37497302cf8f27269e7eafd78bb26bf34dd8a2ff458a4a876bfd90804d6952e
-DIST x86-bin-libreoffice-java-6.3.4.2-r1.xd3 25338180 BLAKE2B ed97b18e75a4c7db8e06778f0279d241c6e279c64968aa1dd39712644ae654e8c5be86ce0866d0b561d4287543d4f077e28ba4c48bef2d36d630fd182f3befed SHA512 a8ac0f146f827a944d953e518f1050d549750d295a86c39a6de40f558c8267d496dfd54f6206b0dc745f56d87e0b8f9bcea456d41cc4d9e25ae08ac62339096f
 DIST x86-bin-libreoffice-java-6.4.3.2.xd3 24828153 BLAKE2B da19912f611914e4de44526cdf81cc3cd029554ebfe1ea1d850c79f95877e686fc1d372804ea9e0f20355c898f00b66e471b8a8f06ad69451686f2f04242d899 SHA512 86ad918ad2a5352d771fff149a80f0d01fb877c91b1dcaee8a4429eade5bee3f64ac389146831b26091fff3a0670e885b675e56b21f9e4beb48af91b895ddb11
-DIST x86-bin-libreoffice-kde-6.3.4.2-r1.xd3 15518276 BLAKE2B fa0e8787b50063579383208cb7bacea952bdf55b9d945ddebc1d0ff5e2e008573e2e1711a5cfb7e50bc2dcf4d1584bb6d47208cfa31321654758214a30137f95 SHA512 dd7f6dd9337fbe06df0779bf3a5a1a0fc8f382a5ea9c6c5eb02d5fe6418de19701d8305cea726c729503c89520043444b622b31814023931a9da3933bee6e7b2
 DIST x86-bin-libreoffice-kde-6.4.3.2.xd3 16007423 BLAKE2B 6fd735641dfa0a3340a27c7f5ec76495559905f0dda02d4d71a40fd2619e4331b47cf4c34329927d97f29ad96450f9ef91456563384c7f375e1bba3855892012 SHA512 e448d6cb693a92a26690f8c8604f2bb9a43883d862678e0c071b8a3289e06397ddacf45adecea2ac456f924693787879828dc0d9d210e5700edc73b1bafde6c3
-DIST x86-bin-libreoffice-kde-java-6.3.4.2-r1.xd3 26706960 BLAKE2B bd8a07d94fdaca1bfb718b99ea726487619b74fd6b3d2488db8f98c1e98a5c62cc29e89d3260b50ac42d3185315227d3583caa6a559254649bab713e5b832632 SHA512 aae33cf21f8bc06b7051cc3b253d9a8feabd1ca848fd8aa337d7de7cf65832bac6aff82c29f499d6278b5eb38f6352a29ce216283f401efda487b1b69ddd499f
 DIST x86-bin-libreoffice-kde-java-6.4.3.2.xd3 25368218 BLAKE2B 9070e9428a52699fdae67ce85502c69171a7e09d45b3cd51c1d783d677de971d3db5aeabf056a4f6b774c0988d7f3f405279f4ae24352c3e9904a385ff93c25a SHA512 e705d70a7a6841309cc0c0f6e1ecef9d2280299a3650558d8d3fe11a07f01d0a10e61046629989b8c7a949f639fa288a79c0116c1edaec4b5a5e6e1b9bf45f0b
-EBUILD libreoffice-bin-6.3.4.2-r1.ebuild 6201 BLAKE2B f781ea2fd08e0c092a22570b49b08d64c3c6b5c9efbdee5da31a30dd2b64278597eabb37cd69797bf5b65917bb69cd74916714aef4eb7679719a432c6c12ba95 SHA512 8d3f812b21bc568397b70a5911bbd121a17152215dd4cb47b6d11825af2295d3da3fb58f3b55ce398ec4f273d1a99d662e7655fb385b73548f954e1df37f1e67
-EBUILD libreoffice-bin-6.4.3.2.ebuild 6203 BLAKE2B 61267f7f69d276b9bc35cc095d83760438f123518d31ae2863be3ee3c794b80edac501a9586f472753bd9969dcf95285b183283e9d2823d3ec3ec7f992f70350 SHA512 7c3a1dcdd43d251562682e8d9b45a358bf08bcae184353f082a7532581e0d06c79358d0cab58269ac7dbed8d3873e51a0d0500c6d67c56bdebda66a6718bda04
+EBUILD libreoffice-bin-6.4.3.2.ebuild 6202 BLAKE2B fae5988722a8b4079cc099982cebb43416a445cb667872cf1e0b62d6d4394119560067d43e82dd528c484c69a16377cf2c1911cb5775156fbd2d8d50367c4173 SHA512 5a0b0fc5d3fc76519d699cb4657bfce11a5adecc8f3a4057e9ca53c31a460ffe71a8f4da87578a761e806bf850478287f35fbf4a1e448b77fb4f98ea7bbc85d5
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2-r1.ebuild
deleted file mode 100644
index e29317cfd888..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-6.3.4.2-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2020 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 toolchain-funcs 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.7
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.72.0
-	dev-libs/icu:0/65.1
-	=dev-libs/liborcus-0.14*
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-9.2.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.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.28[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_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 the Base application you should enable java or you will get crashes and missing features.'
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.3.2.ebuild
index e61156b9b4f8..622973079288 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.4.3.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.4.3.2.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.7