gentoo resync : 02.06.2018

3 files changed, 2 insertions, 270 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index a3060e937467..2513a215b730 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-5.4.5.1.tar.xz 75480304 BLAKE2B 6a7b018e5cfd66b97e7f16e40dff7b6154ce622a2a992deae0b49114ce8bb2077553e2be7ce9b1a702495ba996b80bff39647cb864b688593dbb0edd026d8f35 SHA512 739a80cab6b508244e3bcc8b282bb728271b65d8f48b347ca4eb9e15239b1f35252f322efff85e3c47ddf420cd4f36a9d522fa675c1774f17868c2a69dd82164
 DIST amd64-bin-libreoffice-6.0.3.2.tar.xz 80241340 BLAKE2B ccf0df99283356aa384bae7d33c92fd44adb3aca4ddfd18a1afefad6c1dbf40e6fd31f2fea2ab53f15beb9d13707632c651d94a512ebc3959ae1dbce432139d7 SHA512 72a955f80c371c899c39ca2b2ad29e029ac5d71d5690b7cc198b413cbd2cf50064ee8340fc7fec82b5db24a1d94148788dfa3685dfd70ca7437aad3c0a443939
-DIST amd64-bin-libreoffice-gnome-5.4.5.1.xd3 16216047 BLAKE2B 0ea40233b41c637069174532c509fd36efecb03df10c35b23bb315379212ae08e41318a4cb28e2ae55680e410474a5b1b1fb40c6f533d2f1fdfa98d3f18c58cd SHA512 239cc60220719b1a46b25c6bd5482973b302b3c2b126e87091911355a837eaf653bd2cc5de81ee882ce839522ceda9bd19d47222e1933a3b6c847628d9dd32c3
 DIST amd64-bin-libreoffice-gnome-6.0.3.2.xd3 16533839 BLAKE2B 32513b9df6f67fa54ff61abbf26e48e785cc47ab7f1df38ce5b30bb5e156b79834bbd3933dd9fc15397453af44eb5d1cd60bb07b238df5360ead432f08600bc8 SHA512 677538bf28049dfd4e285ebbe260392ef12730b96c9d5772e919afbea87e07ccbfc427258ecc2715e4dd97e0e0e6c23150a972747848b352281be1da765e07ae
-DIST amd64-bin-libreoffice-gnome-java-5.4.5.1.xd3 26624424 BLAKE2B a79e5e50dfee66e628e217f702c3bd838c582aff3a0501c3423ab275e03122515ea30edbab709179ecbce973604a6b6222b7d2904001f22896efed8c6610eff9 SHA512 9a01c47a996e26de4508383451a4be669512b89f2a0a6cc96cd7f363f05610cf9d244fd30a801303d8db7e866935c4fce622a472f5991d26adfacae9db700bc4
 DIST amd64-bin-libreoffice-gnome-java-6.0.3.2.xd3 27088942 BLAKE2B 3642466bec0631a8c801d10e699c027db8ef2b7ffb207113afd4a80cd165c5575647927095e513dbc7ba5cfc256b9b24058559a18ef47107d3632608da5c1744 SHA512 71c47127cdafc1f89a1bbec5d640916fe4005beb3a3cae750685050724817805a564c4c6ffaa1b70157e0769b363bb79b2cd5a70e42edb439e59e8a7678aec57
-DIST amd64-bin-libreoffice-java-5.4.5.1.xd3 25747222 BLAKE2B 28a189cab3e748056d3b32f7f36037e517aab966ccaa42211e8a4e7f2c1db763b9ff2c84a9dab076c367da7143a6b0c8782f9898e075ff9769f1c4d3e8a5669c SHA512 54d0de9b7f32d9e65e32a8ad0cab5ff212b2751a41c1297fd7c38728f7ff2bb3fcaa9b1bad55714097d1ed726449783b0ed17e43d8032e0e35cc8696b5ed9907
 DIST amd64-bin-libreoffice-java-6.0.3.2.xd3 26086875 BLAKE2B 8b11a74400a5d275c72325842024cc911e38e987bd33f8a42292c4bbba1c6c25f95374c37ddf25377f02e799e47c745704faad0482840e867e53790e76a1fb41 SHA512 b8ecbc631de6451c27a40c5dbe373a829a6a1ac8ad7762817182aac71cb2efb70859badc9f08d67ccb836f32958d79f029236a910f0cd32cd583aff68422af33
-DIST amd64-bin-libreoffice-kde-5.4.5.1.xd3 9238961 BLAKE2B ca7f2853f8fa53eba373ef8f48f32d2f457b9a65d99b94baccc14dfb3e96b2a00f4e4cb164bdef1823c846b71906cbb932a59f4189113d62035c27de64dcf357 SHA512 14ef861c7166b939667fa9e759e3114aaa958bacec0924f98c0562e63c4c5c42986f5c5fc9cfb223b8a7848ddfe653a4f1871581fa4d776a8c64f30a3a577e7b
 DIST amd64-bin-libreoffice-kde-6.0.3.2.xd3 16836580 BLAKE2B b71b5945367d20e0b05cf17304ff860ba6d504a4922c125028ce02748c7fa88dabf086a0c57f35257f511475f87169137332a0b1a44e7e380041c5cf301266ed SHA512 0ff269492903f66b8702168fc9c0d432aa287ee01d167919abe7cd913e1975b8ae63b28fa4383d96cffced5a71420b445f762aa9ec3163301b164122dbe167cf
-DIST amd64-bin-libreoffice-kde-java-5.4.5.1.xd3 25851121 BLAKE2B a81d6a0588b54c8fe2cadf3ac5afed6791f1d752a9fd1da59845e54fee51247fbfe76dd0ed8ef4238e8a3043f24c88e437ace3bc9b07dca040035e9609d92e83 SHA512 120dcce55692e7b3cd681492b96202166a3155db104e8f984c2ff746a747594cf41cb91c400fa9015134e60aafacf77f8f8b7ed3d31ce8c1797b8b2820680560
 DIST amd64-bin-libreoffice-kde-java-6.0.3.2.xd3 27332736 BLAKE2B 6ec2d1b3e66bc05bce17706206fbecc8cb00d1d472795e1b194286e2da4137aacb97f8fffe86b8628d61c3fcfd95e766ba1e58c0aca4f1ac7bfad26c143a1820 SHA512 7116c9ccac4c6453c5f859c12157ee908ad718958922b3c7cfff460319cb6b214f177f1f922fc670a395ce08630987b7f85497dc20f5802e5d2fc4c1aa7fbb45
-DIST x86-bin-libreoffice-5.4.5.1.tar.xz 77649164 BLAKE2B a7b5188dfa3c321a69a0328bf70e3637677350efbb399619937a255cf9d7d91fc16ac27c9acad3627f65e958009930270dbd3512e08021bd45743b380acff565 SHA512 7b7964fc84a1aa6f8300df5be166a76629848ea123f1dd582fe0ce93b4a85dfe5cda7dc5080adca5bd14cf85614172b8530b738a96b3ff40720c4ba41c0e692a
 DIST x86-bin-libreoffice-6.0.3.2.tar.xz 82383316 BLAKE2B 24841434c900c08fe8090e1981cf700b671dc19b7e38bc4d2a228dd86a31feec70de4c569bf9fafae48ca5adba7f7822d491433dd9579a889c9b29da319d00b6 SHA512 c9f16eacdc3efcb30c27df072851e31f519de421254b75196e566c594ae7bb9dab89effb37755554db7c24293bd96efd3647ab586ca63d20cdaf0f69512f49df
-DIST x86-bin-libreoffice-gnome-5.4.5.1.xd3 14266862 BLAKE2B aee448047f2d975de0b3420e125cb337bf9f5131bf89a9fc10294b81751ed107a6de282ea6a27a2e1be91e705c5a34613a1d38a0f169139f48aebbad56266fe7 SHA512 2321c78301c25d37cc06dac987105863faded7ea9128ee0a5a32645837ead75e3c85f78d0f017be6e5c21a9fe4b41ea1775ef3d5ce6544cc4d7931bbc4bf9c60
 DIST x86-bin-libreoffice-gnome-6.0.3.2.xd3 15746873 BLAKE2B ea6ba788dea6e4bf7d02359fc9278306536d6dc67fd1cdf034df012ce66ebf0ffed7a1992ec3630da8788516a07dc4960b7afd1cd885c959f758af80c436b13d SHA512 227556f927e1a9b02120d280605675e2b89598cf8d0af14074cd2caf12da1a939b275c9c720c3eb90319ab88ac5c452e4e84a0dedc62f4b0d02c3ab015503bad
-DIST x86-bin-libreoffice-gnome-java-5.4.5.1.xd3 25919818 BLAKE2B 4ef28d9c32a0caa39e034f14abf9f513c308734fdb1b1c1016ab431da3893b130c04c21110aad464b4f5aa1ff5955023eee5fb722e6734a76da78579d8d02360 SHA512 df2eb1b920899cc26d54780ba3b2d8673ce8c93d72bb2f5d7472abe1b8024d0f2426f935e8e9b9d83f2fc7d2c76c65acb804ca0d41332063637991bfa2857d0c
 DIST x86-bin-libreoffice-gnome-java-6.0.3.2.xd3 25278665 BLAKE2B 73f17e5a6f247aec8183af3602a0e006670e128402fc313ee9421a279a35f39fe4143351df5570e2210fa0b1fe8380f54a719275ea8f35a64883209d599fa04c SHA512 0910cf556e3f6aebafe95f9dd0db45bbb90032f42a4b0245a2447b82f0cd0dd38837a499f4fa308409866fe0c3c3daa8601d75ab831fb5e5e521a02a5984542b
-DIST x86-bin-libreoffice-java-5.4.5.1.xd3 22349280 BLAKE2B b53fbafa5ca66800152af5e548f3600e69d8368b769dcb5553e13a1f657e57a1961438667a3745d1d0e8f46e69caaf31ad7450ef18f2e684a271233584422441 SHA512 8be523caf6b726c3844c7115d5ce922168eed27493c611028e528a98f64650413dcaeac0e589b8f78b52698f17e86fb3b55e712afe6a388dae32cdcf0b5f3d3e
 DIST x86-bin-libreoffice-java-6.0.3.2.xd3 22891551 BLAKE2B 9c83e2028c83f4b03cc4ff2b09fc207ef7dfe7168afb982519ef1581b06d97f78852fc92beebed3af04c92619d4852bf2e087601f02db6ccd3ebebb19ce8a540 SHA512 ef3b518da2d30ebab5d3a86a672adc696f68a970ab69cfd575f9687ea257985d5ccdde68587803830ad2583c1bfcc3f9e7fd30c70ede3abd8bf34b3d978c1d8b
-DIST x86-bin-libreoffice-kde-5.4.5.1.xd3 5234235 BLAKE2B f1c4f2db89cd4f6f013af9a5b9e89b88c1d5a8710ef7f03c136cd99c57d690a358741697f260a4220b74ee2c03280d80669c28112d7f53ca4d1f20d0fb63428c SHA512 993be8a8e65680f4e82040ac0232193c81b600f467d61cf2d8f009d3be3f22a2f24cc3479104c4e64c6cc0a5ddfef3cecd7a51b5d44abf3630d3a93d467a0159
 DIST x86-bin-libreoffice-kde-6.0.3.2.xd3 14377062 BLAKE2B dfd9f68bb720ab03b13c3b5af83d43bbbab28ac5f263806aa89e140654b8be2a6ddf973a3ba26d97ec517ecd97c939517376f3bb8214d38bdd50d844eda0edce SHA512 d87c81ff379e3d59f014a4c14397c4020c5022db353cd5b1e00d56a4cb9aeb1f3e608b9ec1396fc54bd54c8fecd2e48cccce6cf0f4a0831763703f6f512e2fbe
-DIST x86-bin-libreoffice-kde-java-5.4.5.1.xd3 22411985 BLAKE2B 6517ef3900e53d9b96ee41d68760de67a4b9f97d404eea0718efaba6e03771e1428002f1d2a2dd9d63712b9d0cf2c967a530f9579fee32bfe20622a2c5db7d94 SHA512 67eab09e4b46b52a587709244aba99ffa6414d6188340405d24d69abc6da194ccee8164b89a76be8a88c639dc4628322aaf18d2061e491681946201e4d0bca37
 DIST x86-bin-libreoffice-kde-java-6.0.3.2.xd3 26149695 BLAKE2B 7b8d349b888ca929472a519161ea915c3737cdbabbd4fdc7f850e326efa0cfb24890eb1c13e77ec600878bcd9ec22be87cfa1fa63bb692a739872e2264c28742 SHA512 3a3dbc2824afa8258ec546e500c6e232b8db49ddd489f63ed2d23d3492865bf7fc473518b115099ff68917e91d96188931b870d54f19602f3c8c3e37a5bf56cf
-EBUILD libreoffice-bin-5.4.5.1.ebuild 6515 BLAKE2B b743783a5642a24dc684ddeed4b0e5c7a0269a45342dc85c03004ba52815868dcc54c3c862108564dc537460fee102b9ec9f8e70e28eb005562f413ac548af09 SHA512 bb954b1beb92f7ac9ead79536b1c7a3b69aa7b780fb638a45bebef58ae7cc654878882d38e5335850cb81d3913529256e0a5215a68321e53bb6dcda4f7432985
-EBUILD libreoffice-bin-6.0.3.2.ebuild 6726 BLAKE2B 7f7d7f1ec904221a8acf8f09f67360382ea001b71cbeeee2274c364f7c2fd5ad91d326c2749a17ef5bebb25d7b7612e4f730cd913eb20e8e7c412bca1ed22ada SHA512 c6bb77857ff685b17d702de9b58d58cd80ee50c1d090b656de48a0967265156aa37902d672c9d47b44e7690610d5cb8fb80b79d18e9be2c7b050299f433363b3
+EBUILD libreoffice-bin-6.0.3.2.ebuild 6725 BLAKE2B 1f2422c1a1494f1d40f437134e49d88140f0ad8d5a673ae0992f08dfa3642b057c0315952d7f73891f458929d9d54da3f46070ac59eb3ff0c073416472481d48 SHA512 c886bab7dab9c99839bdd18d497f7bea12379fa7c5937dacdaed87cabf4d1562a9fee2473feb168e56cae85f42ae3d9e9391b273ceb95ae1c5d6094a99506429
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild
deleted file mode 100644
index 24e891a72836..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_5 )
-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/60.2
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-6.4.0
-	>=sys-libs/glibc-2.25
-	virtual/jpeg:62
-	kde? ( >=kde-frameworks/kdelibs-4.14.37:4 >=dev-qt/qtcore-4.8.7-r3:4 >=dev-qt/qtgui-4.8.7:4 )
-"
-
-# 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/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/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:=
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.12*
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/openssl-1.0.0d:0
-	>=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
-	>=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
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	net-print/cups
-	dev-libs/dbus-glib
-	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
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.24:2
-	gnome? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		x11-libs/gtk+:3
-	)
-	kde? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		kde-frameworks/kdelibs
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!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:* )
-"
-
-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.0.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
index a74a787a4bca..47d6493690f4 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.0.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.6