gentoo resync : 22.05.2018

7 files changed, 384 insertions, 3 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index e1f25db746e2..ab4bbe8b9e92 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index ec0d53fa2d7f..efd396c0ba93 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,14 +1,27 @@
 DIST amd64-debug-libreoffice-5.4.5.1.tar.xz 1157575908 BLAKE2B 8e1d646aa90c6739afe00da67fcaa93431c2504c190e8537393cac5a77033672a3df45f2b261e8dd262cbcb0e0cea0992994e8bd53f5cebcc5b55d0044115553 SHA512 dac4a9bc7e0c2c11f2d4d45dbb4bc6b91ad32ab226a26cebb81b070b2d672fa03c0b5bc9aee08447d55b285b915a118e6d0fc27c9cba27d9d93ea233c12915bd
+DIST amd64-debug-libreoffice-6.0.3.2.tar.xz 1229801400 BLAKE2B 7803c708814a8551c495d6dacd1f15cfe54bbe95b2101f1551519718dc464f990d86ef6bf3f0de88189f0f1119dd23c00b6557c5b59f7a11c12f56849db6a690 SHA512 46a3d5b27598ffe5fa20683aa4419119659e40fdf64e45a6770627e1b308efb19297ab7f856b2b89caeb3df409d569ed4095ae13fb39b1ea4e10305d2caef3ac
 DIST amd64-debug-libreoffice-gnome-5.4.5.1.xd3 331679185 BLAKE2B aa8e055aa7be3cbca196934e4f2d7ddceb3cccf92a1d3f1bb4bfc8b8e73274abd7b36dfa515e3f11052e131fa31af500761d88e28839c697ca2951e62015b2a3 SHA512 c3d9f4b5732a870090c598fc3d697a7c508b418574899fe36aadc4e691155887b9366ca46dedc30ea4d59bbf7643d839bdcf949abe3fbd683d4e161a20b6ae8c
+DIST amd64-debug-libreoffice-gnome-6.0.3.2.xd3 337274654 BLAKE2B 469596571d6fd22622218c6dc45d9b72638fb7f00cae7137c8a18a7ba716f0049c9b0e63d6811028784a8bdba999442d3da75d1de1d6a07ac09f66b1eb1e0191 SHA512 4020dc29a8c316f6fab9ff9d77faf30008219b01c0bb0cb2a3b48edf6680b390cfebeee22d361ee4e779af30a3e59c8b1f6677669a87f9a41c11a83ea73dd6c7
 DIST amd64-debug-libreoffice-gnome-java-5.4.5.1.xd3 563805504 BLAKE2B 8b4cdf10ef011c4657cec26a78d8ed79c1c8de36a67a62a0fd0daa3d7f9d739bd38d611cf1f79aa7a25c189ec2fb1fa22f292bb79769686dc73be11373b7135a SHA512 52c618371722136bce7440ed20b7d3a01c66a215d13c037a8bb2eb8691f51d38ff37310b063598f8e5750235304de018de9acb77f93912d44f9e22877ed27670
+DIST amd64-debug-libreoffice-gnome-java-6.0.3.2.xd3 611891145 BLAKE2B 9877d89fc3445401754facf2df41c962cc6b69889b2f67b536b6f7bca22ca9b608d834c10eb09ae11f602fe0196b71a37b84f9b92266d72f56c562ef27fcf4de SHA512 175ef1ca77c090e3a6f788925a79b177a7e34e1509d1eb169ca70384821b83b3b32bf4ff4913e6175cddfa3e92ec45dd18ccf1f43c8af9751617e932ff0f58e0
 DIST amd64-debug-libreoffice-java-5.4.5.1.xd3 555709754 BLAKE2B 13131e8c9e61663b6b595af308d307806ab3ded347796d669d397782b3795dae4bb477ca214007cd7470c7476b7ff0fb8e4b0b90a2581ff09bfe273f1ac81eb2 SHA512 809c7787b36a5354295d60a311ae3e5f48f078f7e0a596aa48ab099796d59f3aa30d40441cf834480665717dd72b98e28205e3cc985611901d8ba85d99c4a318
+DIST amd64-debug-libreoffice-java-6.0.3.2.xd3 602837451 BLAKE2B 71a87e3cfe01391ff0fc921e1e8227e5a5f60ea45fba1ea44c657f5a970edad464b161b60c051a8ae01570407994aebba8d69780475f7200d2c4bbf0faa167b9 SHA512 3c07c774e8b7aeb2ccd0977b9fd0737725fb3818c84d2ea35213e10b87543b73a3f7fc4a0c9748b3ca317c4f631308375720c8f73fe7a488bf07374064fd25ab
 DIST amd64-debug-libreoffice-kde-5.4.5.1.xd3 337957489 BLAKE2B d7599148be2770423226666c10511ce721bc59ed29ba54dacc696b6b00768baa6f4f2ebaebad227457db22454e0adc1ea59aab4a63c592b10b87ac773af02b2a SHA512 06a2afb7d014fd6ddbfc935267e59c82a9295c37bd30d17d210627b0678bd6050810c54e675e41627f5f9fe4814c14768c7cc25436388bcbafe5839868fe4964
+DIST amd64-debug-libreoffice-kde-6.0.3.2.xd3 342896759 BLAKE2B ef402abc0739975818feda3c3112f3af36654d0ca912f017beb76b9d3043d371316b8d294ae56d98acd4d3f4073d9505895f6f8f59f1003dde39a2907db4482b SHA512 877575d6c920db5ceb81f259053c8f7296f596e6bfaf75176bb522592f5eff0b4599f5901b42a553fc224a2245cff15b002f959f001be8e438f5c6c081ea77c4
 DIST amd64-debug-libreoffice-kde-java-5.4.5.1.xd3 557521078 BLAKE2B 343b9dc888cc1582e2ac14532f5de2e2b728be3919204296696e208774da82f3e90a2f447bc5c3d703383c57e6155486fd0b7f5900185969141c69877dfafb16 SHA512 519a0977a003c2e1b47832a0a1ebc2de197522b4193a1890330f9f040d23a93b285a1b4e8efbe4de357a40537b68592c8f40cb72dec3d80fa871938f3c246e64
+DIST amd64-debug-libreoffice-kde-java-6.0.3.2.xd3 617577189 BLAKE2B e22f192a8533d3500a3cc362c3d0f713d6e6fbc0874d337cc1742cf7825e4348301885317412ac2c038c6e83269f20e67c526792e0fde91df3cbbe46e5b5bbd5 SHA512 25973bade0ff78f6a482f88449de70cd237d430da1ff8ef561c6fe7eb4459d3e582ceae4721c37e589304324446bf877005de3923b857279c98f112180dca9a1
 DIST x86-debug-libreoffice-5.4.5.1.tar.xz 1130163208 BLAKE2B 2288afbf5773ca93d7eb28e95ea388b4f8770684b55923c291dd80327853d7b58a0895ff053769809a407981d36c4aca3a94bbc3e40ed4daa07acf07c2a40e4e SHA512 7cd7a73996ab43e17b4b6c941c109a0ac99a44727056a54a6ea40a45d59bcb86c1875748834a7b0e84b31c92f1d120898bc63b4400e3be0743bdcfaeae2d04b8
+DIST x86-debug-libreoffice-6.0.3.2.tar.xz 1201421892 BLAKE2B 205c3eda17dde4f096347e962bd3e4b9806da6e1b9266c72fe85b3ecce1d8286ff16857ee32108daea3641cc9fdb92fdbc7b0f175db5b6513d8cea2407ffc071 SHA512 93211e233504f590e3b00a6322038ff40840c446e09094e781d5779d11d0c746cb3b783bee582401cda994ee9424643d5b05fb1673906deeb022b7aee7ecbcb6
 DIST x86-debug-libreoffice-gnome-5.4.5.1.xd3 321731155 BLAKE2B c6c459e01ea90133773436c1ade2911099f8299808c30f92bb55e095c42dc30fffb8052bf43b0f4aa7635e0eb17569644d02bcce9eafe5f6ccce1d35c1ccfe09 SHA512 1047c0c633914ddcb06e430ef8aefe6d3c74d1e70ac63005c6e22982210daa6eb092380cf74d8b41c87d979249f4fe0cbbf6bce7793a3b0a6785acf484616cad
+DIST x86-debug-libreoffice-gnome-6.0.3.2.xd3 327309281 BLAKE2B c27828cced30fe648ceb1005df12c2ca931dc65d3ca696dc763cf458991c92ec8ba89a98c96c30eb60b8ba7f4f6d6df40015c7e1472c656c6cb694f25e83397a SHA512 572a7126a762a8d9c3783f772b9b6b8de931e384d5699a549466157f2fa464843e3d931261e6193221fb1dc53df22e96ba8ab4f68d920bcbfa254c1a397a9082
 DIST x86-debug-libreoffice-gnome-java-5.4.5.1.xd3 535171694 BLAKE2B e3467d6d9656bc76c76fc98a2c5844675b85da47c56512588cd8221935aa53ecebd4bff07e09a27cb9980fad8015fb12f458b47fcb6ac1b6e8e8794a9f1fe621 SHA512 03f065f5a2e4d7fd608cd8820866562d40fb1db64b729522c27e8732c809f5425046858286d91085fe01dcfa3bd33725f8fad7a55f1b078c8b06815982acd5a4
+DIST x86-debug-libreoffice-gnome-java-6.0.3.2.xd3 590466385 BLAKE2B ce857408beada974f07df57f83e4abcd905994be1c393ee5a0319b879c561192fa2a2f7a122f530d82a0cc16ded766e49244c37b463c26bccadf2cfd811a0654 SHA512 2e1981190931cee047dc80bbc43f189447c0e7c3f533438efc7bdc001116db560530af3cd89e6e11d31d65fd05dac914fb40b0b715e5494968436fedc600ca49
 DIST x86-debug-libreoffice-java-5.4.5.1.xd3 527291958 BLAKE2B 5fb90285b7573e4d4bd3b6aaa8fdda01c3bf14fed3f4c9eb0b754ceb899627e2b091e6901370cad28fa407a8a3940e717b191bef3487c54d4f61dd8eaf6fe323 SHA512 8cbd19d8983f310976242c6c4f46be6bcc5e5693e074e997ae4e2b18589bb1d99df6417a7bae1cb7a421374049f5878f333452b12f56b672a48683e4ea72181b
+DIST x86-debug-libreoffice-java-6.0.3.2.xd3 581633470 BLAKE2B 83f32dbc5c095738a485f0dae6ce0a436f64032d9ae4e3ec789f3e1e3e73fb3155ede192fa9132f407556029c33c3915d08f5fb0a5ca05ddcd5b2f99ad48b3d7 SHA512 c31ce9b366879e7d43001212d6a49bb787bfa916b34e2b3faef8560a7b87f8a3eb25d08b2b1daea615c89e36dc98dfc79878e37038433ba3c26427230c90928f
 DIST x86-debug-libreoffice-kde-5.4.5.1.xd3 328651433 BLAKE2B bd54186c17798909ca555d493083b7fe2f7f0820def97b6c09644e7652e722cb2be4cbd8cb6bfc637bd9d982aeb5f5e5dd19d7fc7ec79ca8599ab8e3f913e12e SHA512 776f17374f45d2914946e0ebbba3a75585b2a416660c1a0c79c5b395c33bf1cbe9bd9b37276c9ba82dcd5ca820ad4dc6c1e932e06c0a5adc70e315db72eca2fb
+DIST x86-debug-libreoffice-kde-6.0.3.2.xd3 326143479 BLAKE2B f1e4a4804b0f5b9bd26f7cada129c6de72d39706e41fde3223d933ced0aa50ff60922dee22e6d3dfbfbfb26e5d219a92644e394793fe413041173672de7704ad SHA512 22a1e19316be3f5bec3ae62dc470ef46065ebe2cc3963fe4952d0285efdb4a434224034eb8dfaa60da866ce2854e0020518e088a4be322b944f7929ceb06bb11
 DIST x86-debug-libreoffice-kde-java-5.4.5.1.xd3 529080140 BLAKE2B d6cc31c28189ce1dd1b1e085bf6317914c85abebb4dfad64c15bbdf90689701ba35105ea24692086e81fbe17d691761f1305b938d4256a7dd5857e6ccb13feb8 SHA512 d5e5ee39c102ec951b437611186577b2f2ea25a529d26c01b97dd2452f38a52a2a0649944494246255451efd65af6cdea2fd724aa27d8b295570eb4658c01e3b
+DIST x86-debug-libreoffice-kde-java-6.0.3.2.xd3 589281609 BLAKE2B 7446486d969b3672dee561b98360fdaaf4a8c61de6bec38c7de92716db5694641b6429b3aec025649a0970d30b70e8b6a168bad320571b7c72061985b14acf92 SHA512 aa25befbad574afa525477ff23ff77bc59edebdd7bd66bb20174bcce0a99164a149c572054ccc888fd0179bcb539f746b74201f01bdc35dc613b116a6b86bf49
 EBUILD libreoffice-bin-debug-5.4.5.1.ebuild 2679 BLAKE2B 5d8267d6479ed3e62533f4254f401ca2641ffa93989820a25c5a22425b3e905c2aa9b26d3c177cc5fbbc5cf4d424228e27f57de3080170b24d284aa57328e08c SHA512 89d8eeedc6b58113ebc47c943f970402d5f1465807376621ed09ac877df37e57529490ba60e6cd380e895fca0cb27e2fb4c5345af61c22acf467f13ee878dfb8
+EBUILD libreoffice-bin-debug-6.0.3.2.ebuild 2681 BLAKE2B 73589dfd4620496d985bdd9001da0a05c1dfc60f274c7664aaf8f26519ff8b7801ebd312fc3983e55a5fb5b4ad1e073274787cdbdd6d1d208fa122faa2e2fa5d SHA512 d8c7385cc98b929686cb9ced686391bee57907d983e6f262fff9db69c28ac33fb7361f68d155d5dc077acb61612591d56dd5c5cc60e6cb5d5ac1789a35f9b2d0
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
new file mode 100644
index 000000000000..aff7ec396b39
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="debug"
+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}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+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"
+
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+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_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 760b9a1defaa..02b4f01d7fb0 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,15 +1,28 @@
 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 6727 BLAKE2B a7e9c2750ceadf4d082154e76967b46a0a2f07e2129b5e5c0214ffeec2f2c66bb92fb96499f1145cca3a9696f82d88474c9863c80b3c2ebb255ccb362026947e SHA512 57f4576fda61fb8607a70b7b3b3b18eff6f7eb971c604a199357de928787af8d0c98ea47ed1830d2f6f0af403e1878a562674a40e9ddb1bdcc0e0666b12e926d
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
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
new file mode 100644
index 000000000000..f4d56bb646c2
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
@@ -0,0 +1,268 @@
+# 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
+"
+
+# 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/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.3
+	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[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
+	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
+	gnome? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		x11-libs/gtk+:3
+	)
+	kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		x11-libs/gtk+:3
+	)
+	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
+	)
+"
+
+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/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/plan/Manifest b/app-office/plan/Manifest
index bb57e094d0c0..3409dd9532c5 100644
--- a/app-office/plan/Manifest
+++ b/app-office/plan/Manifest
@@ -1,4 +1,4 @@
 DIST plan-1.10-gentoo.tar.xz 5976 BLAKE2B 598c92a750fc0a305d7f51211f9e42eae36644de1a83175fcb86c8c30450b8fc1e7d2eabbaced62779d80b557f7f725c97395bc744171952970faa3543abba2f SHA512 60fcfe1fec1d7911a155d6737e6a808ea897ce7c4207bd2f4e95f57b1d154d8d594c6f5ecc8a959cc0d7f47f1415f86797e0c4053873775decfc048bc16048a3
 DIST plan-1.10.tar.gz 460150 BLAKE2B a44c79537ff6aae8fa5c65c8b6514f0f37d1417522f4e54823ad14cf6306bb88223377de13f22c365516e2861fa561902e31245c9729786f425140bed30b320d SHA512 fde17ef17f25412cbe69427364f4130564f46a940859066c25d837d14eca6920752b843211192a6c1cdc83be05de9ac57c88424ca555928b67eb219fa8564fe8
-EBUILD plan-1.10.ebuild 1441 BLAKE2B 69d5477eb7715ea35b0507c3f32c1d252a21e6f68ca3e830c15957400455a7c2b75b69b90b41074c1b31a7f32b1cf3e98d288293e9ad1aa264b8d80edfdcaf06 SHA512 317ca27cb1f21d691c619907e86c8fa5a605197841803a558eaaf35a2e3257af828d2e83e24a77a13bc38742a6f135d41c4f0c2cec7e519fd41839e65186c70b
+EBUILD plan-1.10.ebuild 1442 BLAKE2B ad7a1c27524b2b4e7693e1201a8f0d8148bd270bd578e3a41273c493b165e10d189fcf07f6391de1d7c668e206de6e38a9bcfd9f78c057af25b3082e458cf15f SHA512 4c377cc88dba84ceedb674bdc62c6eb90610f14726e9538aee4a2a4297ea226a6a77942082ead1e992d0247d00d77ed5235a70fd96999946b98d659ed2085fd8
 MISC metadata.xml 258 BLAKE2B 18104e5bf54213c7d7302cc72c3ec47d0c322f2fd397dde15b5ee29db433961329fd2b22c379d19125d7f5ded7dcc376d3afb9ce77426d9615022bde50078649 SHA512 a4886b16e304b05a448e28681a38ec68fcdd7828029444fd9c01aab0fdda8d9540cd0d829da2e9f22b38b33d10e85bf111c8e45b49966c32b267c90704adec40
diff --git a/app-office/plan/plan-1.10.ebuild b/app-office/plan/plan-1.10.ebuild
index d2b52296c315..642152f24661 100644
--- a/app-office/plan/plan-1.10.ebuild
+++ b/app-office/plan/plan-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils
 
 DESCRIPTION="Motif based schedule planner"
-HOMEPAGE="http://www.bitrot.de/plan.html"
+HOMEPAGE="https://www.bitrot.de/plan.html"
 SRC_URI="ftp://ftp.fu-berlin.de/unix/X11/apps/plan/${P}.tar.gz
 	mirror://gentoo/${P}-gentoo.tar.xz"