gentoo resync : 22.01.2021

3 files changed, 3 insertions, 267 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 2b781a1806c3..3a754f55e4a4 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.4.7.2_p1.tar.xz 132939056 BLAKE2B bf289afca20492f6fe099ad180d33a730e90ccba60c133fa9ddd034d6751b86ef5f68b630ac1e67738d67d94bb79d39946df52cdd49b38fce401d33521926db4 SHA512 5138d6caf05817f658377b938927053fde3b98a8496cca9555202e862dabef75f35cbcd91c6a570611e2b908e150f6f38b3b775b9af9048cbe0ac31d7b912182
 DIST amd64-bin-libreoffice-6.4.7.2_p2.tar.xz 132899212 BLAKE2B daab7c709cef0298e445e8c2ebb1690a7df1b6bef2932bf3a1d965d80117bc3f5a1aedb293ec7a7c73b61a81cb6ba9d595fa4698636eba066453461dde83d28c SHA512 50715cefdbf6e949b010d449c831387ffe7f1444cdb6f8dfa890113e034401cf4d19774043604475c9ea6fd840f21ed7299234eec742177d82f2b9a3095dee42
-DIST amd64-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1921163 BLAKE2B 15da9d0e63cc85026ab7a3a9a98dfef7a0971722d2a663d54e6c1f9af069f007b3cbdca8b4730007b70d2ce5b6594732f2672578a3739e5be8f1f37d41fa8d51 SHA512 b0e1039cb094eee47e7e146c60e17f1ae0e2c49400a66741c8f9a4f34c32129028b4387a03881a28fdce6c9e56ca71ce0c28d07972821a22a78901670112bca0
 DIST amd64-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1915838 BLAKE2B 4ac09d0e9cadd34b8bf374b91526763d8059f36faa0e701310df76f01dd471a781e7a4a57eca0458200b55cd73803e44d2fa902bc4cf9ffdc9b7819583f66e61 SHA512 bd6754ba2512f1679ab7a98af007723b5a2bcd64f1813c6a2c2b61c5aef65bee1cfd866016b67a456e4bb2295b3664cdbf73923dea9900aff5b88d5f42baa535
-DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 29288984 BLAKE2B c1379fd0ef1899244a513b1f53bba861d41bfd5eae26518fe6931bd805e9b2a8ac5be79710415b4f539d48e38fd964f198f3401f29c073c14d1af0f57ca8e51e SHA512 69bd379194cbf6c376738408a1979f4822b52d2012d1442c32b4320ce410768e69dcaf323527936aa3a9f183c4a846da95f00d8379dffaff055130d2ede4ba8b
 DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 29294532 BLAKE2B fc9d82a6dc3986dbb6d68f8d17deb5bb2477ca1cabaa3abcb214800e668440f3b80338767329aeeb1c0c0c9f2793e482d6749021798c8123f1a07c7f0bbf0ad8 SHA512 b6852c3e504a4a37f151d50df92c6f545434dd285e6635791516e279d93b51b7dd7bdd65d40157aaf5ea9d1cd8bdf06630fceecd4953626ebcfe42f1f015c835
-DIST amd64-bin-libreoffice-java-6.4.7.2_p1.xd3 29140522 BLAKE2B 957fe72caa6c1f8b156d217b8d66b45275bd44b08769ebbc4d1d2cc9e1d4b3918a4c720bc873b9ba181203496a5fa66defb596b3f1ab1d0a7cef07cfbc1f21f9 SHA512 6bc23b125754e0da7c27101e650adf3a0660088306c2dd70ffa6cb403873e1ae0cfdbe4384913575ee4698be9f52ad77d845c8c11bf7a040f09c409da944d28d
 DIST amd64-bin-libreoffice-java-6.4.7.2_p2.xd3 29174648 BLAKE2B 1349e5db1bde42d695bd12dab39af30b8288f0ac318a662b1bfced9e3b18b67d02bb2d00201b1e8ae40f5f860d02be132e4e27ff686f703c229d1ec3c6de3e41 SHA512 ec281709877764827b9fb481be480b0f1177fbb3a281a6be7fc50a75733cca9d8212d9b2d420ec823605a9e2881a02da8716c482c82d85e7a7d9b43efa3fe469
-DIST amd64-bin-libreoffice-kde-6.4.7.2_p1.xd3 19705370 BLAKE2B 8548d25cda6812f20e2a7f8b9a7e0a87a92de4755f7883edd2291cc7b042f316ab43c0825cdcd6b2ad87cf86f715a5d12a63ca81de57feb383ee51410e71bd9b SHA512 1967b746f68e764e3f2499d4f8b23ecfc3c53cc07ab8b17c40b311dc5211b4624218db257058772bebe2455e9ac2dbc243764e9e142663a5fe6dff944a91aa6a
 DIST amd64-bin-libreoffice-kde-6.4.7.2_p2.xd3 19690260 BLAKE2B 902b28eaf17c8ba8eb2496674c1c03fa7317eb7eb5455c0650752f9f0313a1b18910775844ab26933aa95d00be57e4c01b3c93f8a0d7dac15198e56138ec404d SHA512 356014519693e5ca73761f13720abac5e8ff715cd9939bfc50581892946d073664753c373ef501cf6bd407cbce7d85fc232eeac1af3fe5279f65f10585e07635
-DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 29774822 BLAKE2B ae1ee0dcd887eecd425a723827ee831e143369f4d0b4674d0c88ca8a00b1b976940b1d9d6fa56b11beae80955ffb9c6177a823f2aa187f86c7ecb96729500730 SHA512 c31abcdb7402f602e3b912831ebaa7ba41350399866b0955d5852e7c946efc676be8dcee1614478ff4217ce090a3947ea2cc1fe266bfb5c29f462bc5f264e98b
 DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 29809537 BLAKE2B f975c8bb30067a97eb6fd8b7a13b95e6788c5593c7da7eef870dc52ac1d7c3d7c8d3dfbdb92998f88cd69f4578044ed783477e072f1aa4f91cedcca362c467c4 SHA512 802326419d9bcf88add3dd0712d1feb2c8663a9663c762dc1d08e28cb577e4aa0ac4800ef27b39dd523729df8edc069098a69c25f57b461ba908a4cd2064bba3
-DIST x86-bin-libreoffice-6.4.7.2_p1.tar.xz 134606628 BLAKE2B b6bba84073dc16b473947b7bf2f103f2e66226e172e66f612a396d1b206253229eac4320766f0977e8f531290e8365d7c491a6a4ced066f57ada553549741bce SHA512 dbab1dcbb39909b88d77351314441d096ec59d69c383c9a8bcbb82801477e14f0674932e0215ea1945630f328da8de8875b8e240c7e5c8494e57de233a030f0b
 DIST x86-bin-libreoffice-6.4.7.2_p2.tar.xz 134593448 BLAKE2B 26b57979c917dd379c590891fb630485d1ba51eddc18407fd2287de03fd76403137c61a8e8b4a49a2a34c71638b15918912187eb0e7a682ca4b338467d376a77 SHA512 62364be3d5513247d95c839a90643bff630ddc075b6e1c1cc9fe46f8c98338f93fce55c939913417423c0f559c697f1156e2d4a0448f08501b23f65a354d82df
-DIST x86-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1918270 BLAKE2B 3ac058041b731c79e45920a88c6258408acb6b3fdb664da0cd17d0747a1656b1df61c4ab7929c00755fb2b9f62e2f79789a1d915e5f93806435b96ecde072b26 SHA512 7a9ae3883f3abbdd80a63a52d12fe263540686c1a33203693c2ec1d729677017776f3cb9fc391d0796743bedd8315b203603eaeee4a35948d105f5c2265cd24f
 DIST x86-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1892727 BLAKE2B d1cf2b679a91dd5c1947ec60be83fde839159f5b1e514925b90f47cfc28bf0a902d22c4d57834e9548f8fe6867a1452d4d42d098ac08a8632d341110fa550691 SHA512 d9ef6b5fe1b60fd4085feadb0b7f00ea239d4ce86828db7a3f2d07a89dc1bd879d4d6e2e5277a6b98518dd2c52cc692b1b84b74964ee287a1d9e749e6a47ab8c
-DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 27287304 BLAKE2B 8631b35146ed208577dbb621ddd947e3bded055419c34fc20fde02d942bf5b09ab614849ef8ce3fb8374f2761eeda074af6504c122e7072ce93256b603acb57b SHA512 794ad30ce84e4fb2b57fe4de985cd5dbd035317eac1e3a3951b0012204feb581134e57cccf7d113f9129f0a4891cdd65a5c419c35bce866d29dcc37e84abc87e
 DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 27275582 BLAKE2B 4b91ba882e76747227f780b505ca691d7d5dc2bc2a1d3a8305b43248df595e4c429769bc998724dbbd8d0949951b2fb3d19b00f0c76339ee15182bf5193e95ab SHA512 e62fd9d5e7864ef9d7dd745364768e390e3313cee9ea55f021d5f0a12d935132e526c2134c1733c9564622730645c0e1200da9194521f96f5884a678e09391c0
-DIST x86-bin-libreoffice-java-6.4.7.2_p1.xd3 27166653 BLAKE2B 2773a3776d63c87a4fefabbee8336f759c86b08cce6c035da3da88f18a6a5ee3d64ed56e26fe1fc7321aaacce9f1f2df07005765fbf9a5eabdd33df000aff1f5 SHA512 2042f578bfc5610a7d07e754f6eec56a1fc654f254e4a75295171c8ea032b629994ca07b4fa9c4cb96f440677f3bf59a4816de38d1e3eca7dca81a4543cea84c
 DIST x86-bin-libreoffice-java-6.4.7.2_p2.xd3 27169643 BLAKE2B b84c5e9851ff563e5ecc9cb0368aba008f3f43cda15f81d832c3a5fec97953665fcba6b3d1231a7bb14effd5358cc0a363567d5cdf1d00265a093c18ec9035f2 SHA512 39f4465c340fd6b70717fad48905e38519dfb274fdd97f9b018572814bcd2e903690f5a627e40eb20eff004a55cd3a8157e2943d90685ae872f8c51ddbcb6b05
-DIST x86-bin-libreoffice-kde-6.4.7.2_p1.xd3 17414679 BLAKE2B acb084343f735bf0d0cce5eca48a0c66f36ee59d189ba76e664fb65cac76663a83baf7ec921b1a601e142f2a3f4cf90a7a53479c6459dd766a04dd749a95cda0 SHA512 30b6ad2b27ccd3c2e26e0da6a868fa48e5e5648e235cc056f5186718f688fc937158f01ebd8b3916819dab9339db812e470d1543a2254ef8b57b9a92b25b1a72
 DIST x86-bin-libreoffice-kde-6.4.7.2_p2.xd3 17409833 BLAKE2B 032f5b6ca8262443e2d891dbaa8bbbfd8b7a6a2257a40eafbdd06273fc947cd3a9b96cc10334e3a11086fce7ba3cfc5596e767640d1e5d9258f6bf78ad4266af SHA512 d107cfa5310ee9d139e73cf84bb128d91485caf1b51c62168e29697416649e428e0e55cc55d0347ae8e20f4893907e522515e0f5d4fa350417fe9d181de75a9b
-DIST x86-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 27725217 BLAKE2B 30ef34c9234fda34194e11abac36522a97dde1b62ada1cc67fdd54d03f805ca1c65ad9a97c7484023801d15644a85a652c2f4c30c32c18a715bd3b9dddb263da SHA512 753ec089ed19f65fa2b371f02fb3183d34f9f280d6ecb3c93698f394f4376de89b7111d0a8248379f7ee96ae28cc770b66f3efbba5804403f390131fd29d476d
 DIST x86-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 27721907 BLAKE2B 9ef839325facb31ce7b90f9aae404098d49bf135d9507b1941eb3af2c3f7919783f4bee289549c49041a843d87336bbc8a91cc10a0c72a1d9a48d5dd06ef99e7 SHA512 1965b8b044dbef3f3b02b5fde8fbc2b4fb7890ffb01e337d5471b1886361096fd7a5d06d2955bf6df2a448bd143df4f5263aa203a13d5d92f61e2f3cf4961879
-EBUILD libreoffice-bin-6.4.7.2_p1.ebuild 6153 BLAKE2B 4502ed2e82dc52cb36a878ae21b422293923ba3bbf0bc1f76851c321ad19eb9f5abdcf5afecfab4dc679afc7058dd03f00b427896bcc4fc41dc64ddb65849de3 SHA512 7b64c19511727f64b340e9a3214fca3c0bbd0fd0886ea4de9c97bd35c70247ab2d7ceb08b15883b16698e70e0f025a1dc1b2bd10c7fe39a86859349f57113ee9
-EBUILD libreoffice-bin-6.4.7.2_p2.ebuild 6155 BLAKE2B a62e03daf48cf1b6c34ceaba52ce766b5a127b565a2388ac5baa36f9c8411c7cf0cfbdedf996848386360dc341dcb6955697eea5761f124514215fd79a93977a SHA512 bbe486b8c4e1b46262e5a1c23488443eede56009b96c357ee45ee0d7596e3fc7d29fdb27e1a44e9c7928b46ab1e0bb3f4d1b8fa539437b436f21238c15f3b02e
+EBUILD libreoffice-bin-6.4.7.2_p2.ebuild 6153 BLAKE2B 8f71751a7e2020eee8fe20433950c3ed95aa835b554cc8a7b7907a3b14138bfc5ef64c6565445642d6566fa5e9f5c6fe374a3dc3aab776f468307835d606dc48 SHA512 c0f72ea9e366f8b10a609c447980a19364b6cf2f2bb10c2a0e07c6f677866a22ca57e2fd97020674ce3f66edea40a340623fc5efdf03362241acba3a8fa7cc31
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild
deleted file mode 100644
index 725223d732bf..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p1.ebuild
+++ /dev/null
@@ -1,251 +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.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="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-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PV}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PV}.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.74.0
-	dev-libs/icu:0/67.1
-	dev-libs/liborcus:0/0.15
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-9.3.0
-	>=sys-libs/glibc-2.32
-	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-1.72.0:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	dev-libs/liborcus:0/0.15
-	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[X]
-	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.8 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
-"
-
-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-${PV}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.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-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.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
-
-	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
-}
-
-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.7.2_p2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p2.ebuild
index 8660dfccd524..567c8a454e83 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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