gentoo resync : 31.12.2018

8 files changed, 967 insertions, 4 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 3ff15bf1684d..12a41209c6c3 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 0023395ff168..322b6c1be3d4 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,14 +1,27 @@
 DIST amd64-debug-libreoffice-6.0.6.2.tar.xz 1226804568 BLAKE2B 0522713fa08168ed1eeada9a3c7562fd43ccae15b03b75cd7b27e9b800d165a45ee66f9540311788547e0da75c3a911831507a956b3c05f73994c09410a92014 SHA512 76a6c22ec217b338cf6f597401aef5b0d523ae9ee99a680e57b26ab07f56460396d6491e6229e71bb50cbdf3fce9912faf560f82b421093db7d5e6dfe9397e28
+DIST amd64-debug-libreoffice-6.1.4.2.tar.xz 1271418908 BLAKE2B 6a79d3459d8ff10a63e0b163fabc3b6432b27381bd9653bacfa6c21f05fbd006bfa40cbfa1e2e8263996112e2443f78da989ebc4964283eb5a830c94364b9eb4 SHA512 9d40e356925bbaa252110d1216fdd0cd3367070793c0c546d4a541740e72f65b1de42d740fd6676cf903c9f3feda734ee014290d7c721de59acadc33b4ac04be
 DIST amd64-debug-libreoffice-gnome-6.0.6.2.xd3 335183287 BLAKE2B 4bd98a0a3f5c3e1a1b5d68eb9601937efbec1f3dd81a4b463fc99420a2f41ce70c5d801f8045afbeadfbc2f0228941e8504344d0a282e431b53e406df4c489b1 SHA512 54ba70e76bc263e8c1ec554b6241fbc3685ce15e3e729c79bd0ab718daa506745425e514b22ace5e46284562192ae5727b7c4fff9f6f5152b5f1e44912345199
+DIST amd64-debug-libreoffice-gnome-6.1.4.2.xd3 347802853 BLAKE2B 3282b5744c32502555520d21408b31fd7df05042a6560c30573ea4f266ad311fceeff3bfc82d1eab365a14244289a07d58b8aed4f74529ed6112306568b94e3c SHA512 cd32875e42925f1e0f4c80cc36b80a1dfafabe8a5858d4de10e054411f278617dcfe0ba3392ab30df4e40530c5783bfeec94fc9ed11867c6da342183534cb684
 DIST amd64-debug-libreoffice-gnome-java-6.0.6.2.xd3 612061584 BLAKE2B 3cba602d840a8c086161fbb46f323bf4a660d25e3c30e90c79241bc5278487d6038661a87b5610e57cbf08074ffa87cfab7620ceefc51828fa1520159415cd32 SHA512 c21a5d30d1fc6602c3fd7e79ee1942aba5c4af0767311d13289a06980f156c1c3b5c21dac8105bc57af5564d5e663ae6af2617bfc18c32330bf8fd452afad1d0
+DIST amd64-debug-libreoffice-gnome-java-6.1.4.2.xd3 655016716 BLAKE2B b711aed5d834297eef110609a508a7ff7268a3db6024032cb16ae7ecd15a289d7211d4922da701226008a508b86e38ca125c8ab86feaa36e9b826dd4fa2f2d69 SHA512 cfb4cba08c497806416a74e53e2d22fefb316253b09529efd4c5a1cdb5788f3b1db6d07ae8fb921111e2a533b3e944fcd72ae576c880929104fb8c5abb13741f
 DIST amd64-debug-libreoffice-java-6.0.6.2.xd3 603154536 BLAKE2B f9584de8d860d4a7d04ffeecd70c094152a134bf45054a1a3526f061a493045ceed27b5e5f0325f8f836e511af1c6bc64b19581c895bbce592b551460c7bcdbb SHA512 8841179dce5b2adf9a5011715354acb1f20b65f44bb318988a9df910428010ef33d59ebd58a06635905044e45da68496a25325184016e41dd8a7753a38f292d3
+DIST amd64-debug-libreoffice-java-6.1.4.2.xd3 645937560 BLAKE2B 77ebb6d10ee3a15933d73ef746ebcde3898fd266e1331a10d32519cb0ec9771741583e4d7b75350e29623368ac85433fc39c7b513dd128c2ec31af621fe46b68 SHA512 03494c9a2827502cca4315696da47470eb42299b8472aa128c1083697c816307d286eb9e1a76205d7b5a293312d97dc5da1d2715eb174c907ce943875f27e2d4
 DIST amd64-debug-libreoffice-kde-6.0.6.2.xd3 333983698 BLAKE2B 970a9f50b3f0f6780fde8948686715b3f078aeb7922e2604f24c2f57adde7efade1f47eed1f72d487f4a0f662387bfae8a3e60baa0a05e271fdfeee280282157 SHA512 99837f2968f9d4437047db9fe72e39c35797b3c38d1dc271a0156b4665e0573cc129dbc9b98f9f669c92d340dd034cb5eb005ca768f693181a70d447c0e24d56
+DIST amd64-debug-libreoffice-kde-6.1.4.2.xd3 351403453 BLAKE2B b9541d40e054614db12e78dd11b3d481f84a82265c4a9a723bc3c26efad3ef234ee5030eafe950c1f983bfe0f303c23263ed48cc33d3f951e87f6b5790bdb54b SHA512 dd369201fb6b34283852d35cf119e2979eb2c7691a767448008051513dd28cdf400a5680a6833f5ba8d1b18106fadacf0a50721bc46f96a709c33fc83b80cc85
 DIST amd64-debug-libreoffice-kde-java-6.0.6.2.xd3 610851675 BLAKE2B 4f23bc53a115a1a5604106bc8398b1aa40ec9d4329fb4146c13919170172205103c73b7f679f8eae66e7d1eebf569536082e738b5ea2e6fa743d60fa8d7b2c5f SHA512 9a4195becf67a31f0c7ba6653b1c878d4b00af43f2642a80ee097eb99176114595cc2373092df9034c44593d5a3db83dd252541ba22109176393ef276b126345
+DIST amd64-debug-libreoffice-kde-java-6.1.4.2.xd3 658586451 BLAKE2B ad06ec566c299e0b752419cd4f681100a9aef644b3a13512026ee6b5f00eba219f03462a791eff8c12b9d0ec448f6d3f775d56732e16f0f86be396c36d84b461 SHA512 48665da7d924ebd937eb141bfe15d13468704f2f4bf9ef8b5ad6e04399f3427ec5a74653371cf9e62601026518f3a978e402ea898ab1b01da2dfb0bd18a3831f
 DIST x86-debug-libreoffice-6.0.6.2.tar.xz 1198893492 BLAKE2B 36eaace94d6d5bd17be50cd58924cec5459663de005d1e9cc17de13e420426dd9f75ebc30fa2e624d2ee37fb3836cde6008dbb8ea023e454603d8a733e02be80 SHA512 960c973b27ed04e27f40468823cdb092771983995760a008b733ff76af8a25ed9dc4a5fef3ba1969f881544d0d8a92476fe28ff1ff9a123cc095b4d591f28fce
+DIST x86-debug-libreoffice-6.1.4.2.tar.xz 1241667832 BLAKE2B 53b4e14859c7a68f3e959e1c85108e6c4e44d30b874c938fae04e10b2a24d41c7902fdd726492008dd142f74e898d71fafee2bc58e6ae0a631f1ffe09ec300ed SHA512 2e909898a54d4b0e1a993f818074a5efd30e08d6be5507894c5d0cd7a9fcc5600b7ecc2a14784b4f6d65747e6a98ce28735392df1e2dca6d1c80e9130a03257e
 DIST x86-debug-libreoffice-gnome-6.0.6.2.xd3 325202188 BLAKE2B b1bdd507d9d56e4ad9d8880998b866053c76c369e29a283dbefd4d9ad73f45852ae22e4f84b10efb3290db25e1c7a5459c4c622144933b98fb581887e2f48fe1 SHA512 f5e2e806866e4990fe5c5040563c0dde7e7e7cdcb7e1b15d507a3fc7895a43ea03e941d4d06c89ce4c9b9d0776909b5a5da0962d0550ef5c65c3b2f98d2acb6c
+DIST x86-debug-libreoffice-gnome-6.1.4.2.xd3 337409896 BLAKE2B f24ecf7a3f5eb605dd41bbca5bf23c889fc94cb426a6fbb0d9776404c66730f9b2a1fb6f5e6c65fe9f6781c1871ea6f15edfad511c8189b4f928a8292161cf45 SHA512 db67d19dbfb89dfc0b8cadc43435e6db85e3bc77252c9c329dd7ec24467e3ab572e400876ec10630bb5822b8c033e7b017296758695893ea6f71eb4564e0e526
 DIST x86-debug-libreoffice-gnome-java-6.0.6.2.xd3 588188373 BLAKE2B ca498345862349b7181cb1cf1dfce8669867f5ce0f40404575c3325bb36b44f89f5d25ec44fbcc71f6c604ed43889870d93d9c8f94680ef102b8b45b1127c106 SHA512 dac4ab117a4992e9b6e3e9a9e4657ed9ba2cd01630cbda6b9f8b6ed8a6e75e4a212cdcbc3040e1dff991a12212e1d2c242f461a08d236a4888e86179521146fc
+DIST x86-debug-libreoffice-gnome-java-6.1.4.2.xd3 591535581 BLAKE2B f27a2d2d5642d0333ad8dbd143fcc2de7b87cc0b8fb9c0ae5ed6037a9d838d0fbc2572b60043aa64e97d67841fb5c9998d5f1d6820120019cffa09a1ef38da5f SHA512 7a8f3fd0d7c79a5f313c71e3c198e12d55c685ecb5a1cc292dd48485abc19ee457723801aace3d6d754008edafc5174924ae7868b4699d2ace146f265e452e96
 DIST x86-debug-libreoffice-java-6.0.6.2.xd3 579363410 BLAKE2B 5c75930a70f21696d985ee876d2fee1e92494fc9db4ff103ebc9626887fc397905f1362127848d941fe62bb70749817ef972984a60d7449753ec04aee4bd61ba SHA512 92d933204804eb3faf9beca6f075d0ff435785f13fe5fbf0701ce0e2d59102797df85ac33c50b2a62e36f9c9566c04f6551a34fd7376913592edc96f40641fdb
+DIST x86-debug-libreoffice-java-6.1.4.2.xd3 582462747 BLAKE2B bde422971efbf2e5d9002dd94921acd152c0f1a867f911b6d5bc7a69ba78d4c8d00cc1b39c7ed3a4df0dece40437356ee2930745366c366d19ee3378caaa30ac SHA512 dfda55b4437d01bde30d15b0bbda141e0c880843877dbf8057bffda31d1a010f99da71869f296669e687650da250e8f6164948958f55cbb4a997182bde59c159
 DIST x86-debug-libreoffice-kde-6.0.6.2.xd3 324043934 BLAKE2B 4f1da55ca925acacc6621389e2c2dc281b39ee8cd93a819a28c9495af6c333786d9745a3021ba9db46094d5d32a345d1b4731c9e11d59304cbcd0139ac443f25 SHA512 b0103f32bf0314066011442a93144de8bf13e6116b9c9e93656d832d4c7ff8fcdfc2c22ac1aa52887a3ed35476d8954e2064e3e0e66cb43e40c4aa5469207363
+DIST x86-debug-libreoffice-kde-6.1.4.2.xd3 336243150 BLAKE2B 91f903eb7ea3b72b2a1d3afeeaa51e743c890c0ec48b6332db48fcbe330e73a76dfa72f3271da27c04563e7807f50d89e67c6c2ebaa1611ea492240c3783c34d SHA512 999576a1ad32774bc330a9588c8b742016d8c1474780fdedcde6e20449987cc79660294dfc4e257d1911515bd3d5484204092b4344bfd22d2ecf2ee636a115af
 DIST x86-debug-libreoffice-kde-java-6.0.6.2.xd3 587012572 BLAKE2B 5a3495eb3a1b9149e9378501303716c76ba1ce82f18339e60b1727f1467e351b9fa788196fae0f03aac122534d36f26d19d10421fea79603b4240a580b1a6b6d SHA512 64fcbb87757cb8519a2d4c9935c677f112d1d6f570ee30d6226525e9159fc136271e8b31f15ea06864d63f3003526d84c6253c6f532fd0cacc99f755396bbf50
+DIST x86-debug-libreoffice-kde-java-6.1.4.2.xd3 590359965 BLAKE2B bc169ef7144612def9255191fbd7d2765b42ed8e7f1a1450b4253c6bad1b582481c544c237c26d4bc41f724c4c114b8c55ec05989f337de59cd1285c29428d94 SHA512 31bf9f75e1722ea8dd17ef86d7819fcb0f40369ea7d7399fc88b4e715800bf9419cc4d4bd476dbe5840f8d7e9e9c9fe78289caf4938290224f58d5c5ab68e2af
 EBUILD libreoffice-bin-debug-6.0.6.2.ebuild 2626 BLAKE2B 632daab6702e56cce06c16acfda09c0042296e34dfd75246debfc6d40c786ac15f447505a9948dfcfb58062bd86cdc13ed1ec93c8f9cb7df7091fe14dd9f6064 SHA512 7cd35b5da20aee77866d7eb35af29b3335611a7407fe94ac0f30a8faf3aa70d707f1afc2e5c6fcec3fcc684e947f5be887676753b70799f681efee8282645031
+EBUILD libreoffice-bin-debug-6.1.4.2.ebuild 2628 BLAKE2B 2a0de51d58f88ff314e4fc25238f5ce291eda474619b5810ba41be1d9520b3d4abe6f46b2730af53138acfe4c3b57d4cb2bb3ad354fd1d9458535106a51c6c36 SHA512 65fb81e661de4a2b57016e92ce64f817c74696c57cc00a5e7693ba9b5341f262030154605e06a363fb75f9fa22d1fa0a491e1ce912af73cdfe3bcb8d216d0a5c
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild
new file mode 100644
index 000000000000..9db8af43438e
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.4.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="debug"
+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}-"
+
+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 8336c30ff51d..b6a74fe268d8 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-6.0.6.2.tar.xz 80491496 BLAKE2B a182c9e47a625e15a08976dbfe16724f6201094bae93f8a9ed7f4b819a1657a0781d4970ea213e652a49c5916e8e34c0dbeaa4989ee6e2ce4760a041a3714a20 SHA512 d5a92d430022a0b56902395e9224e87681130a489b41aa93d171848d7c612d5e2138422e8738d673f43744963fe0caadacd729f49193cd96e9bd1f394c868892
+DIST amd64-bin-libreoffice-6.1.4.2.tar.xz 81346704 BLAKE2B 5c8a46e58ca3318acde5b7d431d6e2adf69873dcef9552ab0d7c28c2936cda4b58ec38085fff727b57970ae5e5d574de474c91e9ab925f5720d8eb093f97092a SHA512 1e16e0c407b60fe80c2338502c359572b0d2e1946528250e636ea9e3a211685174863071905eac97525a7cd3183ead11187cab8ec2f57fdf71b8f82a6c40e227
 DIST amd64-bin-libreoffice-gnome-6.0.6.2.xd3 16613087 BLAKE2B 7cdec36d986fc7ed3c92c26b1ea91c24d8b951d27a8f0f32821f542e7abf456cd611eee79667e2d508a4d9510d1685253807b0e2a0e62a3f3b3e76a03f12cc6b SHA512 1686d19c296096ac2d3400ea06c8a8e00d56e0db2896d66021b88f7025981d14a9ea207cdb68685a1f6efcbe9be133ebdae27771c8e7c8a9e3c5675bb1e20a9f
+DIST amd64-bin-libreoffice-gnome-6.1.4.2.xd3 17021650 BLAKE2B efcd8118167474d8cc3c134e4d292d7c3db040282e943f90818d9266f987ca96f725d6ce6675cb7228e21b5053d71fe103f4e896db87c176647830404ab7b83f SHA512 803d34cc1bf3555e972150b0eed4f9769e826c336a0ca751960c887d5d7a77ec060d5ba8c7db57636399b97101c9dca12843eac8b6c686774e2c232eaea7d1e9
 DIST amd64-bin-libreoffice-gnome-java-6.0.6.2.xd3 27267767 BLAKE2B 42e3cdb1754bd97ce11320ed6a01b678399be0fb541fcbe9193dcf662955be4d3483fb561958a94b82c73c4c02cc2de88d80d951514a6a0b4667657907941f41 SHA512 820d340c0d3a20074f636b970f5a6ac37a67ea99be1c1bded2cd2d6a508f05e3406e97d42ccf1f66c9beb19f9d027acf2e557a57157e74ff2873388dca123a2d
+DIST amd64-bin-libreoffice-gnome-java-6.1.4.2.xd3 27390110 BLAKE2B 7eb0f8ae4b59926473ddb3d0d3e89ff5350cb10242c93fac696545322ea3f6df1562d8ff4dbf2d65ffbceee8ca8914f3f86b20c28246eb091f3352d551790e9f SHA512 f1e0ed6829f2d8d50fa2a290ba2effbe2c75d0cacdb1315345963abe914e6a0dc7c971a35b1f7a6a80a69f7ba63c08c950b69d1b2243f2a27aef49cc762b7c35
 DIST amd64-bin-libreoffice-java-6.0.6.2.xd3 25919864 BLAKE2B e08fe57214893d270a2f56dd1732a72279f8ba38451ea7bc852ab1d43ea5dab0ff22d77f22456dce260164395f0900c28670c051a992368ebcb1c6a23efef609 SHA512 bf7c988e619399b36471f11ed719b8bac025fe6fb80300b2cd625346035fc823b84b812d68ebd98e81c9eceab632e5a933787088bc55a0719e9ced2305772b55
+DIST amd64-bin-libreoffice-java-6.1.4.2.xd3 26132001 BLAKE2B 6b531b30bbea9cf00e684f3bce96f1aa76989375e688212d88084dec4fed52e8542fe952df909179fa8795e0b9ae3b450bc09a18594da67dffc74a3c2b4d1f4e SHA512 5583f4babf60709ec35c23e7ff72cf5c1048b850ec8674f51c45ac5379444696b1f5797b1697d7b61c059782f019ad1bd6a65bdd384cc7d3f1d9c6eec60e4a9c
 DIST amd64-bin-libreoffice-kde-6.0.6.2.xd3 16483824 BLAKE2B 1685f5af9ffc3d879130741d7ada9abfdbd0ad54c47fa44cf60425cad9637ed2bb1c787e95193c223be44dd03c04585e27210a53f3cf518d354e698eff48a13d SHA512 897bb83515941724eb2b580887d75627e4113b87f57620046fc298cc83e4a7ced5c49320fd0f2c71c7fbd976b69be796702d8522067747b6b96e766d04d911b1
+DIST amd64-bin-libreoffice-kde-6.1.4.2.xd3 17226538 BLAKE2B 3d55535c01e4300be3288cb6202b0855c71bd1f73a180626b2c7adfe0808523a6c24f0dd7579469a57a54fdc829ccd4f3902bcbcd1a887dbed4d94474e270f17 SHA512 4c2fd1d3adb3e6eb8cdd8aa9298dea8bedf6869115c539e295c325ebe5be343a2391ab669141651fea641a088b77e3dfed84d551645e19afca6bc899c69d6101
 DIST amd64-bin-libreoffice-kde-java-6.0.6.2.xd3 27132579 BLAKE2B c7f406f0e2d3ab088985b504ddc3bf9c7e8feb1fd569918f21161dca571af134d5cdbc1aac7d00f5a99d8b943088f711ba6066009a7f399826fae85bc5b3443d SHA512 934d5faea55ec1a8292c3d45a6621e773f1132a51bf513703237b684b22784acbada8b6e5fa0e119ee4ebcf15873f4d7fc56aa60007632da32ed8ed54b6ef1cc
+DIST amd64-bin-libreoffice-kde-java-6.1.4.2.xd3 27627892 BLAKE2B a9e843edd462d903c6ba2843e6c0c0b16da2691328b9100813529b0fbf28fc1f0caabe2c3aef6a89423ea86d1ef7ea168ba67d73b62a12c6be7ff841daf93304 SHA512 7c69cf17e49fd31eca1132d0def6796cc0d3eebc32d3dcf7e171e1553cb0d1424822545b407a6dc4d0ef30fe67d7044cbf84664ede6bd3cb0c6a4e853c03aec5
 DIST x86-bin-libreoffice-6.0.6.2.tar.xz 82803120 BLAKE2B 0257d683e1c567076619303302ae29497bb27ecc38504cec731a71b062d0f7c815dcb0e0c1738a7fad2b22e619c4d9e96932e8cb2b357923131ca50f90945a62 SHA512 8d84192778ea5f3d08c4e02cbb78234dbb5f042e17e591750659414e9bf4845155cea9a0435ae51f5cd3e454df8149494ce4407649d8901d15a47b591c0b2575
+DIST x86-bin-libreoffice-6.1.4.2.tar.xz 83674656 BLAKE2B 89329aad9f8f4d38ec5bc41372307802454cca5e96f984bd9706a53619027ac87b99897de078b3d56e6fb731a6f60165c7b99360205f2a3d01bcdd73d2e7af7d SHA512 38f173b64a57bd4f57761b070a8c7a55404d30177c024037b63b806fa7620c04bf058644b24d8a711b651d11a97955c6771cb78cdf796950fb03c1bae9fd8ed7
 DIST x86-bin-libreoffice-gnome-6.0.6.2.xd3 16698373 BLAKE2B 28926e6691e420aec86c4ad55f01e34a40e5eb3be326c65e2340d794a2a779a57f55a60f596c48488e7c07bfcf597658b77ee4aa0fa88ae06f042590d4d29eeb SHA512 3c9b86e16a5d9f6ca4d0b4d54401641d344ed7ad49bd5dc4425f6714b60d8538dc7e35c5223ef75a18993fdb221d84673885f7078d235d423a9aacccbeed567b
+DIST x86-bin-libreoffice-gnome-6.1.4.2.xd3 15972006 BLAKE2B d1cf1cecf33aa3158ffccdf727fc454f25f70d31cf69cb2ce41867d15bf0386bb9e9eeb382207dda692b6506ae382f29638dd6bf0b9106701e49db42d0f1a27d SHA512 90272f6579dc8e84f43e1332f75ae7380889b8f09c8b1318799d84ee17f45107acc69c059d611ad7c363fb3d191368b1727f07f19aeb9128c61a1e7209fe107b
 DIST x86-bin-libreoffice-gnome-java-6.0.6.2.xd3 24522170 BLAKE2B 4bebdb968972ec06cd6ff65fad101dd857ac7cad3e1ff5c60396cfe24c75ebca2c9a043568444fd20e1b359531ab2902a818e954a98fd51d0396bbbafd6ff8fd SHA512 cf654354b653d682b79b22709ed3129f593e8f6de37f20e643125ebd3f4b0684e607d2fbe86ad0e69d10f113ddbfaa85d05d0f0e534ab5655fe7fa37265bd75e
+DIST x86-bin-libreoffice-gnome-java-6.1.4.2.xd3 25781254 BLAKE2B 83295b779bccb4e3cecae21272639e14dc84cd8095aafb19adbe15867c03b8e701bbc67bbaa817205e1d8aec687e0d2d265d5d3dc459db600c4eb8f0fa2106db SHA512 19e1123d8f14ca3352c3a997d33a71ef892611b6590b58e3fa9c921dd264a5fba39619402fcd3db335929ddadc02364497cf43473d1783d24c3a71908923839a
 DIST x86-bin-libreoffice-java-6.0.6.2.xd3 23279002 BLAKE2B fc540ffbbab1d9dc5c1dd4a05425d2682188e9245532f1cc855277eda8f69e1a4e7d6f3a6ae1041d8b2f66a9f220bd2869fb2358ae7ed658b2e793ea6960986b SHA512 b953afa7faa715a2713e0aebb7fc740f9dbd7bd10830385d3cb19530f6bb4714dffa59eebc42656fa92b12b70bb71825790bdd8203a1874f0aa2604b4e736934
+DIST x86-bin-libreoffice-java-6.1.4.2.xd3 25437540 BLAKE2B 81b009745af9e9fe0dbbc73347faf62b5b53c1bb34209f46b93b7901be30971b777ea2ed27d891f21f3f866b749006e4dc96611fb0d6acfb893ebd5ecbdc50cd SHA512 04bc232a391c3a20be59b3349830825bf7e19f10c2b70a1417a3d32ee784ad999b7fad15b2189a95e9530fb57d8c580e2efbecb71a5e822b816bab1a290158e5
 DIST x86-bin-libreoffice-kde-6.0.6.2.xd3 16613416 BLAKE2B c10e126670a948f60f51f935150d803a20e3f26ea43822173a8d31818bfa851b52ae75a038bb8fa3ae3e3547459264ce882670e88d2f132bf6315a2aa60504f4 SHA512 f857c19d0f6f431be9e9efb40daae14b5f762bf2580024215fa751e9ccccc3dbd368b5214f1669f590f54870e8d673be58fa57eb9bc452fc4f3126c06f437e7a
+DIST x86-bin-libreoffice-kde-6.1.4.2.xd3 15913661 BLAKE2B ebeea8f8efa2608ad23c0cddd7f77f908f2fd99cf877934470b4917c0f125ebae7431166d006d02c02980d5b0e7308bb0ce36329dfefb26733f5f70dea389319 SHA512 079d1c2b76776626f9e6f1c9e25590eb7be8b24e5fe8f40abb78bda4b24b1fda1b3077974387d7d04f41105b0f464af1018fd4cb7b4e0d35465d564a94bbd981
 DIST x86-bin-libreoffice-kde-java-6.0.6.2.xd3 24393402 BLAKE2B db927aa404b4b0d6e9cc5f8be019e5701937f3fc2146d731a8fa007ddedf5a992b1f36c4eb4e30f20821b497d20011441db305d344b24831cfa075a232dc542a SHA512 f42defba10412acb0676fe3e23dfd39a11456812db908ac1e8120d4ef9cf95fce6d1cdcd344c21b6675e17b8117488caa36b0bc44bcabbc77d19c95ac8789875
+DIST x86-bin-libreoffice-kde-java-6.1.4.2.xd3 25702585 BLAKE2B a66567473b111de9a8303f5fd861f5abb62de40be477f33f20755aa2e04896816ff04ce9bc6adcab841adb333a5edd8ae7f50c201d837166e81f38ccef49b8aa SHA512 f5c689cc8682652d2c9b7c3a5e7a7831295b55f241d63aa9e0f470ee772d8a7be4c72244e4e2d76fbc82cb075b0fcfcf293ddf27bf6aed83c73abc57f491fe33
 EBUILD libreoffice-bin-6.0.6.2.ebuild 6792 BLAKE2B 24f3505fe905125205eec9529be539352d8418ab4b8fa2cc1dede6ed841cdda05304fac9d71bef08236f16d375133dcb6b93142c65689764060203d7ad0013e9 SHA512 b5a2d493c5880dc772ccc2abeaf9b8eac9e1a87c44d08f912be30dd1ed3f897a7522edb27e9ddafffd4550adab36428e84707b50e6f90be1f27dd5e3da09c02a
+EBUILD libreoffice-bin-6.1.4.2.ebuild 6771 BLAKE2B aec3262e690a3fb489e89ee2533f50353ff430db44353baef765d5ba5f9c10f05fde8a3ff14a8cf05d8f669fa65315d19c4278bcfba14e6b61f1aa608289c49e SHA512 a5c9542c0692c006f13f0d3720b881b06abb51f5dbfae81f4a4f14c3a378008a6423af7c01973f40a736f86a225fee6b6e3765c111c01d4ed8b78c5139a4b2cb
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild
new file mode 100644
index 000000000000..1e4586411304
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.1.4.2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2018 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/63.1
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-7.3.0
+	>=sys-libs/glibc-2.27
+	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/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/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*
+	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/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
+	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
+	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
+		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/Manifest b/app-office/libreoffice/Manifest
index 6250da429824..c6379c1bc5c3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -18,5 +18,6 @@ DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b
 EBUILD libreoffice-6.0.6.2.ebuild 16750 BLAKE2B 7ea6bb2645ee81c15ed71d5353d15507ba5c29d05758de31af8528897f251880f08e08dad979c43d27a9199429c182ec618a038f772e5827106b824343e31948 SHA512 d7dafe868dfb5a59199f71090bc05cb6402aa247ee309e5fa199dcd00d2c44f57a5ddfc6e97f7f851c457d0fe7fb0d8033795b58ae626ff2c616dbbeb0c13e64
 EBUILD libreoffice-6.1.4.2.ebuild 16802 BLAKE2B cce42bed53384a2362edd12cee583a142991a0d4b7f97a9011cdcae0a37744fce32ca381807e1d688185a2beb3649a49940dad2ffa2cd85d2040397d2c998118 SHA512 a49bdff7cbb0bc586d5589c2c1cf07bae590425142480657bf9e4acc3a402780aa034b0c67efb79dda49a8d2e9e722fd7944875fad1445776ee6247d7c3a5b67
 EBUILD libreoffice-6.1.9999.ebuild 16802 BLAKE2B cce42bed53384a2362edd12cee583a142991a0d4b7f97a9011cdcae0a37744fce32ca381807e1d688185a2beb3649a49940dad2ffa2cd85d2040397d2c998118 SHA512 a49bdff7cbb0bc586d5589c2c1cf07bae590425142480657bf9e4acc3a402780aa034b0c67efb79dda49a8d2e9e722fd7944875fad1445776ee6247d7c3a5b67
-EBUILD libreoffice-9999.ebuild 16893 BLAKE2B be990cffb5cc7338165c1b72abff267e926b92436c38160704a2b2148802d1bbe32ea0b22788c4c6055b73b630572a3db4b901c855175ae80fb56b8a2978f69b SHA512 1e372bf57c226fd624005dfa04dc49c3299552aac862396d645a799cc4f3a395fe61c68e89b60370e1aca6f02004b45371b2aabca50feeedfa3b8ad62c765816
+EBUILD libreoffice-6.2.9999.ebuild 16843 BLAKE2B 164d3dcff010af3b9c8544c61c1f767dbd3ce998fac34379e2c431d9ce6d08f9a34d436005108b505b370e632cab6ffc0d3715a0999fab0c80a365ca05f9b69d SHA512 827da528559c43600afdfe96cb44c267abed25d29d5661399cfdcf86204e95d566827ece053f5dbd3c4d6279636f479c988b526f1998988c8d9d39ef57d7afcb
+EBUILD libreoffice-9999.ebuild 16843 BLAKE2B 164d3dcff010af3b9c8544c61c1f767dbd3ce998fac34379e2c431d9ce6d08f9a34d436005108b505b370e632cab6ffc0d3715a0999fab0c80a365ca05f9b69d SHA512 827da528559c43600afdfe96cb44c267abed25d29d5661399cfdcf86204e95d566827ece053f5dbd3c4d6279636f479c988b526f1998988c8d9d39ef57d7afcb
 MISC metadata.xml 1008 BLAKE2B 62a25f90e9b01f8fd924e861b0ddf1789e3124474cf73e2fad217e54e0324e38ad5bf37ff703b37bb5946d66e5de8711ff5e9b53a15e0ad368ebb3d04a3a05a3 SHA512 146662ca1c1dd7eb49c00b927657329befd3ee58ac0226ebb5fe81aefe90d7bf66ed6113cbe93774c0b917377eef8c1821a9ede278c9ba791a3ab544a2eaf2c7
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
new file mode 100644
index 000000000000..b75bd717a250
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -0,0 +1,576 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
+googledrive gstreamer +gtk gtk2 kde mysql odk pdfimport postgres test vlc
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+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/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
+	net-nds/openldap
+	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
+	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	gtk2? (
+		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
+	)
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mysql? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!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:* )
+	vlc? ( media-video/vlc )
+"
+
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3
+	dev-util/intltool
+	>=dev-util/mdds-1.4.1:1=
+	media-libs/glm
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/ucpp
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use java || \
+		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
+
+	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
+		ewarn "Firebird has been upgraded to version 3. It is unable to read back Firebird 2.5 data, so"
+		ewarn "embedded firebird odb files created in LibreOffice pre-5.3 can't be opened with this version."
+		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# system pyuno mess
+	sed -i \
+		-e "s:%eprefix%:${EPREFIX}:g" \
+		-e "s:%libdir%:$(get_libdir):g" \
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use kde; then
+		export QT_SELECT=5 # bug 639620 needs proper fix though
+		export QT5DIR="$(qt5_get_bindir)/../"
+		export MOC5="$(qt5_get_bindir)/moc"
+	fi
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-report-builder
+		--with-build-version="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--without-help
+		--with-helppack-integration
+		--with-system-gpgmepp
+		--without-system-sane
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable gtk2 gtk)
+		$(use_enable kde kde5)
+		$(use_enable kde qt5)
+		$(use_enable mysql bundle-mariadb)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vlc)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use gtk && use kde; then
+		myeconfargs+=( --enable-gtk3-kde5 )
+	fi
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+			--with-jvm-path="${EPREFIX}/usr/lib/"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	# hack for offlinehelp, this needs fixing upstream at some point
+	# it is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	(
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
+		source "${T}/config_host.mk" 2&> /dev/null
+
+		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+		mkdir -p "${path}" || die
+
+		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
+		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+			-dir=helpcontent2/source/media/helpimg \
+			> "${path}/helpimg.ilst"
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
+	)
+
+	local target
+	use test && target="build" || target="build-nocheck"
+
+	# this is not a proper make script
+	make ${target} || die
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
+	fi
+
+	# Hack for offlinehelp, this needs fixing upstream at some point.
+	# It is broken because we send --without-help
+	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
+	insinto /usr/$(get_libdir)/libreoffice/help
+	doins xmlhelp/util/*.xsl
+
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index de17c67160e6..b75bd717a250 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -187,7 +187,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
 	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
+	mysql? ( dev-db/mysql-connector-c )
 	pdfimport? ( app-text/poppler:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
@@ -440,7 +440,7 @@ src_configure() {
 		$(use_enable gtk2 gtk)
 		$(use_enable kde kde5)
 		$(use_enable kde qt5)
-		$(use_enable mysql ext-mariadb-connector)
+		$(use_enable mysql bundle-mariadb)
 		$(use_enable odk)
 		$(use_enable pdfimport)
 		$(use_enable postgres postgresql-sdbc)
@@ -450,7 +450,6 @@ src_configure() {
 		$(use_with googledrive gdrive-client-id ${google_default_client_id})
 		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
 		$(use_with java)
-		$(use_with mysql system-mysql-cppconn)
 		$(use_with odk doxygen)
 	)