gentoo resync : 19.07.2019

3 files changed, 2 insertions, 290 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 65142bf0dbb9..97e3c46c7ca7 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.2.4.2.tar.xz 103982884 BLAKE2B e1a7228ee94784827a689aa29f1e37f712d5ba9bce1e0f8d4f182b5fa93e5f9ad67e2d71b7f3abd36c1dfd893575679d7181b24ca520ef44ff86d20ec7bd0b45 SHA512 2e0a4fe2a12be7bb38d17e151d5c24f852d838a98f2dabc2f2192d2d7d2866457d69767aa2e0caae0f48a0769998b1ca29d07be07a151478da0c02f70e9c4525
 DIST amd64-bin-libreoffice-6.2.5.2.tar.xz 104233412 BLAKE2B 577d104f966b6c8809246569cdc92c4af5815ba69a9a56ec41e9666f1f45828385f84cd6b611d76d4f6dca5af75d18d735153ea8eb4ca6e5998039e09d308c2a SHA512 784d780099f14ae2285c2c45086d49571b8def5d531c5dd0432c53922ef560c4c9dfbd8f318218b31823faeb8dc3443a1b2da97b90dac0964b54d0c2cd7b26a3
-DIST amd64-bin-libreoffice-gnome-6.2.4.2.xd3 18912626 BLAKE2B 5710b82bed9a0b5db59b3709f6f7bcb54bfbfd4ccaa86f4e84949ccfba0ca71f1d0e8a6b3d9addff1e59e7a35504cb26b3f262d26d38998dd4ec179b33b88d2c SHA512 1acb5ae243ee212b6fd2b0a48aeab56b39f338b574b049ef67e58c703ab0474026853e605a39d8f30fddfca48b961ab7d4fbe40a7a49933dac656af6e84bb2c6
 DIST amd64-bin-libreoffice-gnome-6.2.5.2.xd3 827035 BLAKE2B eb4e8693e0863da1170c8cf28abe336054544e87c4c19862e5de90e068c233ff20d287db88f7bfacb599c010d9926198d7654233f3993981c6a9342e1ddd6645 SHA512 09811b27195733a4d62899491c02f72177a9a3ba14bfe34dcd7e103710d3da0a2d750af2094900168a668f5b336c47e4756e045ecbb19f1bc1792ad5b0ad6b00
-DIST amd64-bin-libreoffice-gnome-java-6.2.4.2.xd3 30448355 BLAKE2B 0d3f07b879b67f9135f8fca9a6c2dfb77c746246347d01052fc808b02b70a13a4b4eb772e0265f0fb35c678b05c0f72a5dd0350ee57178850acfed7eb63cc0e1 SHA512 44e32a43a71f3b3c81f14668a5af97361bf3bc1f1bc9770607e34e33dc0b610d4c1443a32f86a124bc2ef5d0029fbcf6d221e91645adf07fba400201d2e3b6e1
 DIST amd64-bin-libreoffice-gnome-java-6.2.5.2.xd3 29528433 BLAKE2B e8d61fbc5c3b0df1635d9a5f1633884c8090db509ae053e45a9d3c8462737e258584f8badea038218c1af6fa2b8e438afd923d6496207daf9f298b1dcba422cc SHA512 6cd2fb0bf978fe6ba2a5e0b453f63f4443f7042a5f9b1b158aee5c17a634becf1877f3e39a2e689ea65dee95a60c1becda1a381265cff55a32ada5d03104f09a
-DIST amd64-bin-libreoffice-java-6.2.4.2.xd3 29169303 BLAKE2B 70b6756bf9625ad4b6ae5eb1bd3d7f4c965c527f7fa87f2074ff1fe7510c374e93bb07170939b6a08e4d6d68df7d47aea1c4ffb77d93f8f9d7fc51034615b294 SHA512 4118d897800b20b73f414daf594d39ef5b5b0d923d4b2ab54ea26b1346c238ab3d7becff7716e2e88da51d98918bfeb122405c95c3e1db926e389b137fb98dcc
 DIST amd64-bin-libreoffice-java-6.2.5.2.xd3 29397096 BLAKE2B a96bdb8054f340b9ed8cbfb0cac13240787d6cb21babd17be2136e7e1dcd63754bdbb1d346ad00f87c3b90d0540b9ad314adb681f6441e3bf564759cd2fa1142 SHA512 4d557944a8bcae5ede07229ad487585ca9cd1aaf532a9ebe3bd6fdc2720461f760dc54b62ff8898d1a876786797ce2dce0134e7c200778d269c9ff24002e9270
-DIST amd64-bin-libreoffice-kde-6.2.4.2.xd3 19572204 BLAKE2B ccadb3d665cea7e036f92ed813795879df59c32092c09d9e0b2fa11ef4f3c402368f57d3713ab8693e4f0713699d1cd132ca31664eb3309b487c67ee52be6eca SHA512 1c1e40b0b256ffb623ebd5a289c8bec1b65468de0dc0242eb03e37e8894c5cde43b122846698524d4b20804b28ffbc153cab33ef08c61fb0f3f7860ee8b5fec6
 DIST amd64-bin-libreoffice-kde-6.2.5.2.xd3 18176613 BLAKE2B f96688eedad180dd21336a4458f46281a267ab6b0b8c274a9ff6c0f60415c63e2de723d8474781cb91e426c230f54dbc8032133a4a30db048eea59f31279cb5c SHA512 129ee7e6020db5bab4fb50e3a87060e561e598a6a1fc192d3bbe8a3770ff25e66e3e96b1c04a59f56dd72e18c34a94894d8ed82dccef44f332205805b0891f7a
-DIST amd64-bin-libreoffice-kde-java-6.2.4.2.xd3 31004830 BLAKE2B a7084f685d9315f0dc367005fbefbc00f42458e4cf8e6701e7de062d8dc401c28f55b96cecbd315ef8f2fdaabce5288715374f00257552047a78ffcc30db90f1 SHA512 da6e037640ad107d3049142f834d2803821099b03cbee6fef875afbeaf33f701479a528b3a350926f37b59e5787ebe040c4b79daaf9d2ac0d6ec5196af4c584b
 DIST amd64-bin-libreoffice-kde-java-6.2.5.2.xd3 29682018 BLAKE2B be1088deb9ac86c740294279cfab4ba55b3db7a9dd048b35275b323ee2c3d69cf7fb5ea9ae188870f3649abf353ad02af20f93343720c618a02a5135b37ced17 SHA512 da772be63d9195756c4d1468be37dfaf2f245d4259f411913fda58eabbc85041359cf7f689050752efc2c30ab30d35adf2e94bfaefdce1cafc762c52ce7d7b50
-DIST x86-bin-libreoffice-6.2.4.2.tar.xz 106392740 BLAKE2B 8552710a146d18033dc32ee4e24061c1dfdddce14ac9981235bc7067ece4c6a3d3606a85d9077644129d262c107f4ad04dab9d9c82e91d78770c9147c0f6da99 SHA512 1a394eaa3d432a9165e6425b7aa085c94e931f1fee8abfde3478b7d1c281759cce0d531135fe936e55ebb911a308de052110ca851560c7cf6d5f8b256c1ceca1
 DIST x86-bin-libreoffice-6.2.5.2.tar.xz 106672784 BLAKE2B d87da2ed1497b28db4f315c23c98ffbab8877b126d666e521c6ef3702a1459b3d8718e0fda86b9c9afcbcdabb31dd7ecdc0a5a858bb3fbccc9f2e60ec36325a2 SHA512 a9bd4931dc6dbfb36ddbde6d2bb68370f33d1cf747bec8851ed89339e01db6f634989cfc0e8bfebe4be369da50247db9089fe6cf267ccba8fa864d33161a444b
-DIST x86-bin-libreoffice-gnome-6.2.4.2.xd3 17326095 BLAKE2B 3d5596048653f50262f35e892252239b47273443a285d5472e3898b3bf4964cfe5a8698ac46c3bf9edae447993d74c5c1d8336545c2c171040e2f1219e734a8f SHA512 ac89e94e9e64db01c2b358728bdd31054b96efe70f75c200725bf9403250aa58bbedae114f64cd95bce993c8e6f064cd6f2c05461589d23eeeed170d0450552c
 DIST x86-bin-libreoffice-gnome-6.2.5.2.xd3 826042 BLAKE2B 0841b8f411a6c9998253fcc7577a7961c2e7f57171c16261309b3de8279658b24868f35c006e2dbc8ec20d469fd121c0a74eabaae4264d7bfc6a02f71958ecc4 SHA512 42b9a6e009941f2422bf349b45a52912d2012468c3cae7eace956b996b71018bc9073ae3b8fd708360909f8a322465c2c9fcf8f93e9a889b034a730865a9e906
-DIST x86-bin-libreoffice-gnome-java-6.2.4.2.xd3 29605719 BLAKE2B d5a4960599251a92fec1481383d5f5c60229840fbc94cc62051c52a3635bed32d30ebabb4c63172bae0f356fb5b0f7c634f9de89b650fe4cc8dba2bb2b740695 SHA512 c4b8ac5424a27a6e87a914edcb16ba897d7c9b3b6d9899d765b1b2530a4cea27468883456daab32f83a1936a5700f8d726e342e138d2bc80fa85dbd4ecbcdd30
 DIST x86-bin-libreoffice-gnome-java-6.2.5.2.xd3 27157887 BLAKE2B 57ab773fee43927fdf6cd154d3a263417dcbfce54dccdecdd3bf26da4bd663e875f915effbfe0e93b6994a9fecd8eaa072dac44c518e884d77aaa90b9e6868c4 SHA512 53efa82eccb47720b605691d90c9e74b73c705336c4f97ba73d8afabb9093e154979be1a2f3ec5e3485848ca5eb84b62285d027eacf47244709df492ced526b2
-DIST x86-bin-libreoffice-java-6.2.4.2.xd3 25920366 BLAKE2B ffa55133cfc039f306e225968ce953cdc397b1e5aa1ff6c4508887f485c2f73beb82f4ae46586f2af2833a371ee9b7373d0b7405884e355dd1b179ebc0b4a32b SHA512 8d4109bdb5b68787d92869424bb8f87ddec47f360ced68050002562459b99e39f4e925fa96904d92166d431ffb06eb3675cfcea822097ce1e858657dab844ef3
 DIST x86-bin-libreoffice-java-6.2.5.2.xd3 27188472 BLAKE2B 5e01d5fcbb1e4a93a1f08385ecfcab9582dc1c062bce26abcff6ac744e305e4da4e70d28ed7d7c35a0e768cd39857f67bfd168aaef303ffa4843cc4277efdb2b SHA512 44b5489748fb714b2c23e911121ef916eb8c8655408de458ae8ce5d15fcdaff1ab882207ca937115db0214c69b5aade30128d79d7a0de1a6c08702263a34c345
-DIST x86-bin-libreoffice-kde-6.2.4.2.xd3 18283075 BLAKE2B 485b77a94350861c615388d591963aa327783dea382084c2394e13b51712e85ad6d972e118da91dc6a0f65663e6ef72d043c435f34f8f3a6dce548a997a4dfea SHA512 8a987e679a3c078c691f7006dde590cca8f1f3d2a06fe164244da813ac8b1acbd766d271fdf23864871f835602d4d00e2b90e693cdc2da4a0cddba9bc7ce9776
 DIST x86-bin-libreoffice-kde-6.2.5.2.xd3 16337918 BLAKE2B b1bbb4f97f8a78f3904c10dad119b3854c9091749757b3d904733c949aa6c6fd7cb14b794c45e267f42c342a8d32185c6ded95726e7e93fbf092194e4fbd3f3c SHA512 b181b4aa5a483460114e591bec9bec8d6d3c777bbc027b03b4793a6babc46b56fd88888e02fcb4b142178a28d9748c0a0fbc2b5a55c7260dd86f22cb492c7c7e
-DIST x86-bin-libreoffice-kde-java-6.2.4.2.xd3 27890295 BLAKE2B e5d9ade91a15f1474d7cc41216a363ffea712020a6f35af7080ea95400101a3158aca8bdcddac9b910c8dd6a9d454d4e9116fd92b3330fc57950fc421ebdfe60 SHA512 3d82e794770237376293b2048f8e1ca38320e75ebaf3b825a074b00cf0c710a43faa3cee328e310c689af34aa466bec7512cde566bd7cab5d814aebe39c31eba
 DIST x86-bin-libreoffice-kde-java-6.2.5.2.xd3 27572925 BLAKE2B 57a97620414c95bee128fb0afa5c586822d479eb0e9e2915a5f01de4077d6c1f008f47453dc0db2baf03b658c414f02d83cc5891caf84270f132ce69ed5d6bc6 SHA512 6cbd73b1e73afbd98d5a6dc784dea52ad460e74dbf04183864d2b614c85f386ec80ae7f3b727f18f1f5f4551e6c0120105931008fe37870262a4e14443445016
-EBUILD libreoffice-bin-6.2.4.2.ebuild 6804 BLAKE2B dc093bcd6e7ce734d7e5d5bb870cfca42a02c3ffc15d1682e7dd9011a337247ef365660c40a6d9fe2ca8dc89846631ef4990d9510c17738b2ab10c96bd1f0ae3 SHA512 d0af333dea9202e5c08866211859d1168e10fe53c74748df3a2fac642823a17622c42c87c44fcc7ffbe5317d2a29f18bf10ec7a65b06d9c2553336f6e07bd441
-EBUILD libreoffice-bin-6.2.5.2.ebuild 6373 BLAKE2B f948c7001a85b682c43ea27664774a7c8b2990333f9dee7b4acfa1bb003eb2d193d51f695d6d71af97589e04f8ca1d2d27e9f497b5cad83225d5f8c973957153 SHA512 21e8f197ced5a34ba0b4f071ba7d4e1fbbf6c42f9fb0c1c684c131dcc67e4f8c04438a3c2c698b43482938c3d616b91c5a45388f653885363c4e5ad88cab5598
+EBUILD libreoffice-bin-6.2.5.2.ebuild 6371 BLAKE2B 8a198d65e9061e5ccef36b778d0b466a682f2496de445db8d7db4c7e5e8f3c9fe06fbda196915665bd8ee36522581a8ce3f541ddbc95940cc5ee3c99082660c5 SHA512 0e2c7c1e58a4a82bc14fc458b310c40780856411bf47b057074aefb50d7db51f2c2c2c9d52c8ea1c0d914a54190181e0f293449b9d617dc3f0131995f523d7c0
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild
deleted file mode 100644
index 9eab9fea90ed..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-6.2.4.2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 gnome2-utils java-pkg-opt-2 python-single-r1 pax-utils prefix versionator xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.6
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.65.0
-	dev-libs/icu:0/64.2
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-8.3.0
-	>=sys-libs/glibc-2.29
-	virtual/jpeg-compat:62
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	app-text/libepubgen
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	app-text/libnumbertext
-	>=app-text/libodfgen-0.1.0
-	app-text/libqxp
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/mariadb-connector-c
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=[nls]
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	>=dev-libs/liborcus-0.14.0
-	dev-libs/librevenge
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/fontforge
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	sci-mathematics/lpsolve
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	net-print/cups
-	sys-apps/dbus
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	gnome? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	kde? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		media-libs/mesa[egl]
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	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
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-${PV}*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild
index 8317169b37ec..e992e8933002 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.2.5.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.2.5.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.6