gentoo resync : 10.09.2021

11 files changed, 483 insertions, 9 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 8ca7a4c8b26c..0f574b790805 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 c94131149df7..0f3741b06fbc 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,11 +1,21 @@
 DIST amd64-debug-libreoffice-7.1.3.2.tar.xz 1430819908 BLAKE2B da0ef021a72d20e84486e649ae90239185b692ed64f402c959550cf311479d9903e84349a474dfb72005c628b68f6905b7364545512fb99248fd8c4f43d1d59d SHA512 fae7dca5b37aaa4f7f40c965edb02c23ac7c21a5b23553191d74fc50c0248bf7a6e273e3e2fa95180fe007d653b596be076773db745a36685ac6db8803d8eacb
+DIST amd64-debug-libreoffice-7.1.5.2.tar.xz 1437063320 BLAKE2B 1d09fe48dbae806f97b6d9d9e83c50d924b35a2344f769066f1d38eb78f12360803deb1fb7a0fb42375bd5e01cfb13a4d3e23a8c4b0e503ad1cbd8e50acd3350 SHA512 3542ae47b91d55088939ff0f7044b139cce51844c383c0c86ad73c05869c28d860681d87fa7db492068fee50a6be79fe5f315b925e8eab3c75dd965d4480e4e7
 DIST amd64-debug-libreoffice-gnome-7.1.3.2.xd3 1367611 BLAKE2B 164e9981016143faa3d93489b3a9a0dbe236e46e3f86bf380b562ad824eec05e3e50f495bcd8a6db84d162251676144c5231701758e31480aff8cdb3e418b86b SHA512 f612d68dcd73621fd6efc9e44ae0a4cfbf6e93cb2ced5212c834342b49e0d68b395688dade5a9f13835eaa2e4aaf0e3e4a3925d63f85b8c2941407fbbc731cd0
+DIST amd64-debug-libreoffice-gnome-7.1.5.2.xd3 1371566 BLAKE2B 5351af652fc8f9dbbc1137bf8b3e1f582ebe95ace4206f9087d15c654707b30db807d9804ef48fd086fb962841b307a28ae748f18a3350e8c3d316270c4afdc6 SHA512 33eb76918014537ead16ddbc107c43c65896bf963d0be3668cd4dfe141cde2d3cb94ae78451788d19ea5d99c1c9a380c7feb4ed223268f8f12c4b57cff056fa2
 DIST amd64-debug-libreoffice-gnome-java-7.1.3.2.xd3 731501740 BLAKE2B aa7a0501b6e29890a121b079e527b09a437559f70e4ab4cd28c98ae22a556aede0ca778a8ec38ed32bc0b80b663b4066fdbef916af0ad01221c3e6e92ac50867 SHA512 295bee2fb3a1693be6f30bdabe22c14d5d6dc3f4cabb678f290344b818310c6150f41ac7288a52816622261e9f222d7406c1679d08b8fea53396323f25539789
+DIST amd64-debug-libreoffice-gnome-java-7.1.5.2.xd3 732827556 BLAKE2B 54c02c804a2d985657917b6cd4381f872e8e3dab295341b47bc9ed10ac06c934880b92a22f87ea3e62daf5dfb35691d1aa136e4c001b6cf7ae847b8eee39783f SHA512 a3a6f3e0a223ae09a4babe07d62effc61c0610eda0f7259684714909d693553f77f8e55ed79f6949bc79f35eea59584fe39f2a3ff6b969c684b3dff5aeb4031b
 DIST amd64-debug-libreoffice-java-7.1.3.2.xd3 730129783 BLAKE2B 3547e67e7cdfe541bb131ca75bd113b00951fe217c991d7054c62e0ad97de44151e55c57569870e448464f73477b05d43481fb6b51f67951aaf7adc6747f8b72 SHA512 c9c57743487ee525c796063c7b4a56f875212617e963a367b0ff257a6b5ebb35fbebf67ff73b4a6642899f2c988081911b7786bf683569c8e2032257dce7a263
+DIST amd64-debug-libreoffice-java-7.1.5.2.xd3 731460990 BLAKE2B e63a9208e6f43fbc714d2c7eeab1bc214eb1e69fda77cfbe233f77969b7c56e0ebb4860b3e47f382b1c1838dcac23c8d7c241d5d47f1fbab90d5053540ff781f SHA512 558ef24638b6354228090721876967cc5fb4210f13d75b547048f82e76c1eafd9879f0cc66ba4f003c8c47e557aeb3dadc4712b1d77d1fcb0ad4b3b6fb62a7d1
 DIST amd64-debug-libreoffice-kde-7.1.3.2.xd3 473351754 BLAKE2B c317b5be920bf5a2d822bab77d2a1b1405232f1fb052a599019c5b4a6380756a99044f01493ac1056ffe2d454a180a1371ba2556227fb7d6da5a9e814fbb36cb SHA512 de06c26f7c07a4c459c7f9222cb9d72b019fd2db3d17eeae8732d84cdf95dc827442228d161b653b11de74ae41895cc31bd767156a5f73784f720a039797ecba
+DIST amd64-debug-libreoffice-kde-7.1.5.2.xd3 476457589 BLAKE2B 4cce5ad6f903c1730174757cb9206f9180a47a991444e509416640d9100a917ffc92d00c27fb86f4d5d001a8c9030f6f46183cf17f8e5aa06f3a1092e4034119 SHA512 9a78a78dc205c09123fc197b47650e2ee6eede6581b5d7b5bf74f2b81944bbbb9ad59ee3e93e1050017892e417dfa07814fde28d2c54ed4eafc946be3c6e8df4
 DIST amd64-debug-libreoffice-kde-java-7.1.3.2.xd3 738307655 BLAKE2B b8f206d1554a7538dcb41c16eedddb0fb62664b9571036582e2e30d057d9dce316d21d16d4f102b60c2d1cda95c6713093bb02492264d8f6948a27aea60a06a8 SHA512 d8f130c9431cb204b9f26396cd113b09ea15f523c919fe9c46e5791f2916de5bdfd7fa3f48608fe0708f7905cd4aa2f3930771b207252c16718a3a1b0894dbe6
+DIST amd64-debug-libreoffice-kde-java-7.1.5.2.xd3 735257243 BLAKE2B 0c99b81768758179ede9650d9537ad0c1a4b5c7eba7619327372c4cd9f07aa6531e50a4c5422eea44d9af43779c70b456a1385384947557de103088391b72fcb SHA512 acb9b3576c5720d8bfef56855ea3f0cfc6e4b2e08fd8a4e18eb9fba429930eb43ff6b47bdf38b0e916db40b372ad82f373b59922afe383e6908f9b2adac966de
 DIST x86-debug-libreoffice-7.1.3.2.tar.xz 1395491568 BLAKE2B cb6e9558e85d04ef489b2026894e104ed2ce16870bea12c9d83b06df0c5b71d4ffba3347a859406a4cbad91a59b2fd1b1ad784487f6f932f72bf3edc60396779 SHA512 6aca88a28df9c68f2bd402bc1c9839b8ad6774cd471fccde8352e5a626a83e15775fceb198538f414f3bfa0b5c22a662bedf7ced0d857b05fc2226e461134788
+DIST x86-debug-libreoffice-7.1.5.2.tar.xz 1402266416 BLAKE2B 5501f4e243a89c87b98ac81df771a36b6a2d35e0f8d11a9a67d551e51bd277bb9102ca7e702a856a666fcf093c8a4f622d76d70627c24d18f4a12b2bce74924b SHA512 bef41ec678d64acae302b64cd8d8da80972d625807051b0f954053e20fa30a80f73930d7b7e7a245393fd3c31017e9b751c70d67bb471751eb2edece040aadd8
 DIST x86-debug-libreoffice-gnome-7.1.3.2.xd3 1314030 BLAKE2B 7597d1a1a3ef8af551e9179beda38ee3f46125c872e6518408039382194a086d8bb16f6fd4c6f69412c0e8e5342726175c4388a910c531dfbdde34ed399117b3 SHA512 e5c7eddfc41f2a72e0036bdc17fb231733d865a0ed759190d0e035b27439e57a910b9b21ec756a82536b0d3b3deed96f38e72b480c7d90824e25c8d373d56921
+DIST x86-debug-libreoffice-gnome-7.1.5.2.xd3 1320792 BLAKE2B 9434e7dc88e20296b38733513c18d8784ceb18e6fa0d2961d3c57f58d3a2527148af24050976339e14994f6d4acff56814e4731fd706c3171e0905dc7aeae4f6 SHA512 8ddc526ef18fe2f17fdb1ca61241a0b9d98d960ca4d9dfd3b60029a18c80b023d44b08702f9dc4a02ed58676a9fbd0783a906076ba697d1483bab653c077ad57
 DIST x86-debug-libreoffice-kde-7.1.3.2.xd3 450440021 BLAKE2B fa08b235a8d1d0a05fdbadb0468aba7220072188d4af82ecd5ca71daf62db9197e0a47fb61f168b4d9a9de7e1d3302225e1abad76264ea59e012491e18980057 SHA512 49b167f15bd5b2d50bd9ff53079b71bdf193b91c02cc03d2547395c93d9bbfada7c3a85741ad30bf172d5e5ecc75e8b954354bc5e7f4b0dcb9e86ddf48699e83
+DIST x86-debug-libreoffice-kde-7.1.5.2.xd3 452499073 BLAKE2B d172637d88bd41be1dcb531acb7651cf15a5c60c62f75c02adf750bf4036b9364271f6644ab1013c16cf72c97b8bb3eacea715646e4d08859ac1741cefed9bee SHA512 03f416f5813109701ef5982da96747f8f48da29d3b08d12581177f01ae9a845849256361d305a9b997bda15c126c64fc440c925b2e199746496f8b2cd866adcd
 EBUILD libreoffice-bin-debug-7.1.3.2.ebuild 2451 BLAKE2B 6c34f11d713dfad61cb6f2323316ef614fd74f6afd0f0a1cae29d40ebf043e97eda7f50a3c4c9d4612e5a94a76d8018c6b65e39635709bed3a0ea1eba07aed86 SHA512 efae8f71ebad7cba2c406fc798707b6ebb880026a3658e90864954ff7f081bf627f7bcf6cb4b8acc787fa8524c56c863e396c75190eaddb9d48021b25c0489f2
+EBUILD libreoffice-bin-debug-7.1.5.2.ebuild 2453 BLAKE2B dd1d41f52e625da4c4b070080a5bdfe727b9e42881298d7cf2cedd9624672fc2de6e1735355e9cfb800654a801a7ec4d6c2b9baeebe7292e554211f21b451f4f SHA512 2aadaf7bdf97e631cde8d43aa02b3160f5cae611ca19110843b7f2d4bb6d8e53c6fde9969fb660810e66c9ca7b785a0ed4d1a0cff81b5a7d6dd7c331c7582a4d
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.1.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.1.5.2.ebuild
new file mode 100644
index 000000000000..080fa5ac1015
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.1.5.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.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-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PV}.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}-${PV}[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-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_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 b85b78cf4cc3..c0534add4edc 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,12 +1,22 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
 DIST amd64-bin-libreoffice-7.1.3.2.tar.xz 134793996 BLAKE2B 1fcc252038f4a3421456c2f8d3b5899aaf580bade6311a2cee15b117bd66ea9e0d25327af412ab00794ca8fbce6d9c19f722fd8e42f5a758fb77ef9a9197124c SHA512 2c5a4fa09ebadce9f756337f84670b6e0f35075a41ab94bee8d46a8c4fbab208c1eace1ddc0c85c117ee691f10bf89a49f9499f48d9179fd0d7b92fac75e4667
+DIST amd64-bin-libreoffice-7.1.5.2.tar.xz 135632188 BLAKE2B 0c7740d0687cd1585e31d58f6e65c9597ea3e29c1a185ffea92f356afdfb6f0d05a4fc5d8d563d100267591d7421ddc76a68a296b61abc9de32aa88defae723f SHA512 add324021d7aeba8bdd4991db690102d810d78e19d4e99132f1b2dd8ca5e8df6baacc302c3ffe16fca04fa47e4a03eb1b6e173665f8faaef3c1745654264160b
 DIST amd64-bin-libreoffice-gnome-7.1.3.2.xd3 1454680 BLAKE2B 0cc37af88f92e63611f9b5839abd5df17b691372cfe35647849a46d077fee602a9e666e2bac03e7b9947f366c66fe320f3210a3da20eff6892c8c2423ac90097 SHA512 0c60c2eb83850923943303eb20488d93bbf293c6537383d5c78d929db7293f7ea8646be1e5a4434cdbced7f76cbda848e8f8a0989d1a86d3e50bad77086b70c5
+DIST amd64-bin-libreoffice-gnome-7.1.5.2.xd3 1452639 BLAKE2B 346b6f36595b72bec1fd1cef254f9ba754eccdbc2125607bd0724d40f37d73e5ae4442e0c3d2d28f131d78da738e7ddfaa463e08e3ad20df1d0209367b36a397 SHA512 0669b6212d46dd9b255dfa5af4b668914b88e7fd5f3a0941a9a33c1823adacbb8788a159a5767269a53c57895bdc364d62fcc46aa48258dea8e98ea780f18200
 DIST amd64-bin-libreoffice-gnome-java-7.1.3.2.xd3 30402804 BLAKE2B 75dc39f40d891da3d75abda9ec9d7d00e8eb167af8df2967689610e7bb2a2744bf2628c9fbe165122b5899f2be3d604c385c904f4832d74c921a87cf97a476a2 SHA512 077948fadfe2e353550f41a42d6e1d8ca683553ec25e787831a082a005449d6f7adba732ec240df1237332561a702bf347e7e81e661b48174b433d65d444d303
+DIST amd64-bin-libreoffice-gnome-java-7.1.5.2.xd3 31245709 BLAKE2B 273ced503b234cbb1b263729c1ee371b3877e6317c7bd6627767623ab5402ccb62bc7bc0a7a436452d51800ee1af702f939d5fdd210819044ba27d4f4fa6237d SHA512 2d1b507d1976acc9012829c321171642a425879c9220e9222ab04296a6975ab1e309589c131436f0f81dd670fc43c57f61712a11ec0c01afff6328d8656027dc
 DIST amd64-bin-libreoffice-java-7.1.3.2.xd3 30266030 BLAKE2B 6386d2afeffadd2b917aa98895f46abb6a357660211f8e479aba3576f49d6c5d587061a2cc382ee8b64d922ccfad06ef14d94fe002494418c0d42d83fdf94305 SHA512 d8578955121e39aefa176a86b25f31f0aca2a7ad3d5463dda44c316be908d974abc1ea965807ae71d1290a1badfbb49d6067e9334e887d72b1e880493b0c81d2
+DIST amd64-bin-libreoffice-java-7.1.5.2.xd3 31129840 BLAKE2B 08340ae6b6d1398fca8a4b9f68e59e9636563daa5e2fc36e61ee9132762d607b38a6fe9aaedee164353d78027ea24372f929f509d26add72ac999f62597c9112 SHA512 7252a332b2aa632b6672ffe566edbf5795112823b6598877674c5a1c810f6f2cdcedfa8421e345dfd62e69af38c946a926c3990f17873747f3f78c4005317b05
 DIST amd64-bin-libreoffice-kde-7.1.3.2.xd3 21322010 BLAKE2B 9b9a90372114850470bad680b50af6d0c0e33f9d3918d8ce7b843bb54d839815b604797295b3fbcb04e7c7ca11c1c5713fa2ff9b83ab545b0a874badd2a32177 SHA512 d14c83d60ecc68e593f8526d09b0854d4a48524d5b81b1b548c5bd2d499be23ac3709ac1ba1b52f8967e1f095d3a479cd615d5137a64407ad90e928986d7e272
+DIST amd64-bin-libreoffice-kde-7.1.5.2.xd3 21940401 BLAKE2B b0b6ea5325f300eafb3265f6ebd08d72fceb73da9aed75d0caef01ead7ce6ecf08420023a2c69c43f6e76b32b65fd5fb1f0855445e2086e2856cd61e4dc108f9 SHA512 78b080d31d247b23cc4464ca1f8cfddde074f604a77b695d20d14c734a83116c7d8d77ef5ccac1e5048c7a54056b6efdfd03673d6c289fee2b2e303575fbd9fe
 DIST amd64-bin-libreoffice-kde-java-7.1.3.2.xd3 30613052 BLAKE2B 1bc769aff8965af40c3aeeef8390d44a9c57f920ae02e0ca4c9667071553c900c85268b4113493d6f3004edb9332b1719676077a30f4fa36575b483ccb1ecd79 SHA512 767b1d2c8be628fdb759440e5007c02d3110e288567cd67ffa18cb16da67cfefb8c2ada10c617f95900acccea41783fe6aa6834bbbc242d26a4929cedd09c4d9
+DIST amd64-bin-libreoffice-kde-java-7.1.5.2.xd3 31235891 BLAKE2B f069f037fc0cde082601db96ff70f13d6fdd65472793566bb29abbc03e46a3ae1c8539fdc054f9fb8302987946b7a1858e83705326d94847dba7d71f721d8539 SHA512 9040ed351c5ded0a0b50720edd1629f569b8bd455c8691340387ff77a99b2ef9f1d787696615a1255a235c3efc9adea62abd3d854f68997cc0b78dd1bb554d04
 DIST x86-bin-libreoffice-7.1.3.2.tar.xz 136535384 BLAKE2B b8a567cdadb36b6807a848f72549e781a6e44779464bbafbe1c228e4f1a17accb705336719b647990faea6df50a6949427babfaadeec6a3859b1d0776a6082f9 SHA512 d2b39f84bce4842c1edcc7e3c6a5a6dae0b9517bf73de5b62dcd475a93def8236d29633552fee088742de3458d284aaa782158862610f174740eb5b3b06238e0
+DIST x86-bin-libreoffice-7.1.5.2.tar.xz 137121580 BLAKE2B 2b45ff087a34f60af638baa0f1a603e50e06083ad8f4518213d3f6a603e410ae3778b02a0edd9de0554c5f21e4d7500cd98c4d58168417660275bb6027bf2a4d SHA512 9b20ffff147ccb0cd307faa6ed683b3f8f30b6129237ef0ec733f71132aa36266aec37b948dbdbe9e70c6a08c4f84f3ff9dd8f7bee84ed4f9d50c38dcc3aa0fb
 DIST x86-bin-libreoffice-gnome-7.1.3.2.xd3 1463008 BLAKE2B e8e40a4bdb9163722bd2eba295fb529d2ebcc025e9721ca9e30a5db0f4c5bef9f3e08b6efcc7b7e14b8cc6f59743ae412b1ec34ef5c1431cf0c61b5e87676cd4 SHA512 061b7a3d72e20d1f928dc8cc36f8d30f8830febe23cbfd66f4f973c7402fd05fa7b129e75ddbf9ed4073ff98162f90fc7e543672634e0b9efa05e9325fd9f4ff
+DIST x86-bin-libreoffice-gnome-7.1.5.2.xd3 1459130 BLAKE2B c53851d71ae61aa34c3b00e31e7a9218c4f8a7762febb798f2e3ab5c809c523afc978be8d6dedbdb79d9f67d60cfb28c709a477c103c2e2d1afbea8d70f798bc SHA512 b875d0b1b17ed34662eb5974d4696f0208bcca80d0a07301f2d67f6351330496e1cab472618e590459baf2f66bce24aac7247d803e0e5e3b09945f61e12d7895
 DIST x86-bin-libreoffice-kde-7.1.3.2.xd3 19177685 BLAKE2B 9598c49e65321a4faac6da16ae28127ddcd25bb5d056a1c0ee67b7442fbb25ab8df729ae3de7c7e1277c1364e07cdfb46b123651d03ea261621885915e944e47 SHA512 be53f662163b8eea5fc47d46942c48dea848c04f42278f90b3dfaf28ad4516e9c61ce0ea052bc845871bafb7a6a99d323e5ac3cbc60091d5e251c041653e339d
+DIST x86-bin-libreoffice-kde-7.1.5.2.xd3 18984437 BLAKE2B b5072ff8240a61cdcf593dcb3e3b04108f9fb7b309c38b9eb84d8f09a15e76c1a1f68d007b27220923be837f14c6bb1def6461336dc2693ceafd6852c8488704 SHA512 995dbb120d76ef31ce0fa8c3f7354799d9bab929aebe8120842e58c0e06eee21314059f6bdf3789b029d69f44df9a5c8fe5151f7e1cc9cd1101177af1e4ad7c0
 EBUILD libreoffice-bin-7.1.3.2.ebuild 6127 BLAKE2B fe27e27746819b2b81ab97717bec5c6141353b3301896815a5a918edcb6fa9db1eea9c87fd4326cc8934da82aa90fed497bbec781afe94a1232397017ef5a7e1 SHA512 658afc3ff525860afa143c99a60a46311d3e7809de73e240500a88290649813ae21f5efd0c624a220e44b2045382052a0b46d4e70ae0a6c2584f946b5e20f3d6
+EBUILD libreoffice-bin-7.1.5.2.ebuild 6132 BLAKE2B 070ab7fc42cf74b2c0110a062e2d38b163b4d99fac0736113eaef43191c0c89419fc09cd93ddc8a028d7cd2331460eeb3b844d2c156e656f4078d89c470aace5 SHA512 2ddc2c43c92b73d880da8704f25650006bf326115fc2e29e9b8b872d2f5c9faf0364cb9feaaead2456f5f398a25347838e2066257a2c47bb307dee968fe41e1b
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.1.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.1.5.2.ebuild
new file mode 100644
index 000000000000..7f86be3073bd
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.1.5.2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_9 )
+PYTHON_REQ_USE="xml"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.7
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.76.0
+	dev-libs/icu:0/69.1
+	dev-libs/liborcus:0/0.16
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-10.3.0
+	>=sys-libs/glibc-2.33
+	virtual/jpeg-compat:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libnumbertext-1.0.6
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	>=games-engines/box2d-2.4.1:0
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	dev-libs/liborcus:0/0.16
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	>=net-libs/neon-0.31.1:=
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus[X]
+	gnome? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	!kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl(+)]
+		x11-libs/gtk+:3[X]
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( || (
+		dev-java/openjdk:11
+		dev-java/openjdk-jre-bin:11
+		>=virtual/jre-1.8
+	) )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 0eaa54d8c7c8..0c584e4c6705 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,6 +2,7 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a
 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083
 AUX libreoffice-7.0.3.1-qt5detect.patch 1065 BLAKE2B bce0bb8d36f903516f437520e0b1a99080984933173ac30686136632a795f16b8e82f7bfb9dfe77b048154cf3616b3c6c96fd7c563284212ce4b3f9a4490f368 SHA512 e4273fcb2140c50c9030ef3ffeb451169c2e04fcf7e43650ad1d0928fa18ebe77dd482e2686fbaf9660aebfc17b9ce22b3dfa76f2248ae4af9bc51826e2785c2
 AUX libreoffice-7.1.3.2-bashism.patch 1092 BLAKE2B 0c14e7a282cafe030a39b15551695e61bd9fd70090589e4b94b0839a31b28e634f927b7a21e73de74ea890fc575ab23923a14ad9e226a626dec331db9014391f SHA512 abafcf90b93078c1ec8cc8bf807ec089fc0f79a3eb0823a1da4026a40281369998b72a2c894dc268c56af586476d39991099b99a2f9a74d03fac98b856d4e84d
+AUX libreoffice-7.2.0.4-qt5detect.patch 536 BLAKE2B fd77876d1ca3973ad30c9ebb60bf28e163dd29dcaebaa2b94d84f4c2ab060617d96f4df3d5114f17f882b0cb8b9e2ecdb284fdd1e4aaf8a34cc0c1f06a295c04 SHA512 e1ac7dfc4743cbdea3050b18c1714d06c8bcca4abc51d56e13362c8379fbdd3d37a1916c962fcb1389783c9b1fd72783c9ee45fbb649538ca0fc0cb7b05bcacf
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 BLAKE2B b2b91f608cccdc823c11ce946ecf12b8cb7b1218fa8763ed7b64cf2567114f0703b4103a4eb2369874a4006112396470d1a0a72e6f186c9fac629cbca0fe18d6 SHA512 9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44
@@ -21,14 +22,16 @@ DIST db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip 1396007 BLAKE2B 8012d
 DIST dtoa-20180411.tgz 48893 BLAKE2B 4a03dc67e44353ae1c0653c8305d2df9bcfef16b48dff6df5c857a6bd0510a92aa6d9b9660ad63b2344d5195fef072e526f8d7900791b15442923b63196dda3f SHA512 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85
 DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 BLAKE2B d3ac085a39ee9798182b70ba650fa954234b964e33278ac4fe3f84f8c3218ad49f12d139079328036b4f9d80cde967888c0a66393c34dedf27af69dac02c5aff SHA512 9091d3628d9c75c068507537afc9e10bfb79c1abfd36ad697af3d592a1cc049ba6640f665bfc53cc520b6a26c21d70b0275106843444b441484c2178f2784743
 DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 BLAKE2B 2c72493e44d3ad1714d294fb7baaa85d33fef2eb4ce75bf507b65f78f1d9d399bb5eb72cee188a8abc4b234eb2845a26755791fb3ac104ffe6e55013ab41ca8b SHA512 c1a15ebbfe817ec79d4b3f1c97d096bf8511737d7d35d97302856ccfb3de14a1cd16bd31000415d9ab24bbd9ef770d37855cee4b819ff0e8fca2f2766920a114
+DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa8b9e470e10044dbfd3812391f29e1421df8d7ac3869955698ddbc9575feebcfbac27bb074a60ccc0527dca1c3 SHA512 295ab15115e75b1f6074f17d3538afe0de9b2b77ab454f5c63cb05e8df11886d82942fbf21ba01486052e3f6c75b0636b99d8e660cd3472dc4b87c31d3cd557b
 DIST libreoffice-7.1.3.2.tar.xz 244104432 BLAKE2B f73bd448f94bc88a1dc775d032ce849ee1dd610c4077c709ffbe40d8c99527c7775cfe2309a636093182ac988ecf44a4b61df0e0a83b332fcc77a05edb602791 SHA512 d7329475cad5bece9358b29bc590da1841c3c0b4aef511508d9398519c514fa176c90675857f1830925818f2dcc8b9c0986e5d34d3a33cce617e4ada23c60a72
 DIST libreoffice-7.1.5.2.tar.xz 244350068 BLAKE2B ac3c7f5cabcb27ce3ed31febb04ce54b93bc8b4fa716259d1b93d5364e75b85af3352ad70a023b56271e769f5537b3f3151e837ee13498e08f1871e5b47d778c SHA512 dad5ffd344a7bad88ed8e77df4fb17b42237715e7b1feb7a7de164f2fbf6698feefedeb57974d8275067a06c0da60e9b07a333ccc1bb2f6d55a6b52408bd9b5f
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.1.3.2.tar.xz 111785416 BLAKE2B 12d97764976ae0e4736638e9b758c5920d38d608e66fc3343d74178a935632396e1e07fbb98b6f380fd103c3f5e2edf917726a760420f6dfd3d2e42aaa215096 SHA512 576dbea391777a907275b630ed704dd3d9ad0627f8a18da1cbd23fe28df04c3a509583c2404f810df3aaac15ef0881e2c1e0a55c9f31618715586628873367eb
 DIST libreoffice-help-7.1.5.2.tar.xz 111785852 BLAKE2B 18962fe9260f6cf8ec7b1676f077b9f43e0277769b31b8e2c22cf83ac2963f3e92448901bc12f56dfb579da8a8a1ce20d6bd34c4bc3449f7e0972c03d22f63be SHA512 c669b6c4bfc3c6f46e4ee0bf86b158054f7178b9785273d9aba8183236b2ff6dbaf5584d5e4fb09bba3a8d010373599e7473a4ba15c229087c689198ceeee1c7
 DIST skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz 10420480 BLAKE2B 83bcc9ff3a3a916ccb92f49ef69f99386e89b636d37679ab17735625c56c4bb31ca89a7034d9282c905b405e0b31215de5fd3734061d323d48db440e4ad52643 SHA512 8e5c37b895d7f5fe15f491005ac46b39efe3bfb3af5dc805bf1226b2112496bdb9e433cc3b313f8fc185fe1f898d126b8a557d23485615cdbe917f0b76855f3d
+DIST skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz 11672176 BLAKE2B 64d7821656002d23be839079dedffe1132497992aaef97ec734d6e430f2eda69f5344ca7fe75dd68fee847fa4c6638b4fc28194a951b91498ece5c6d4bcf3e44 SHA512 ae66fa7caeb5a328d96cd1c35eb8700080be5d3e3764e35b8056b03948e44b8bb8266284c87b44f9200accb95dbb8a2771a6e5ba067d34a7fbd33b1ababf19f8
 EBUILD libreoffice-7.1.3.2.ebuild 19593 BLAKE2B 0ad7019e0cef8ab019f5993897ba2641c95258cf21251b0b86266a1c9af92e01153895be1198b234ad4381546366642412739ba79d9aee1cb258ae2bcd48f717 SHA512 909cf68a3d06c287feac0b104a9f3e262e5216b11722029f486e2e982f99d07d259db4e04125c9016d19c350d7599f5e6b72ffbae59c9bb070d4569136bda740
 EBUILD libreoffice-7.1.5.2.ebuild 19609 BLAKE2B 83226e67fcd0f3fb54690687dcf0c8ee7426c1d97a9be7b4fcb3702752aa06ac3eb9d815b34d9614e758d920fee56ed5858a387261818d270bd04517a59d686b SHA512 cfd2da54051e21a35ff93999c14dd0fda841bc081d1398990a1674f820d3cd66a55bf50769f39e5bc97f76d21fd70e8ab9e9ed34af93baef4e539c2a90eeabaa
-EBUILD libreoffice-7.1.9999.ebuild 19530 BLAKE2B 200d1bd15a68070a7dc1f11a57bf06af8f4da3f1fddc77572e6ebb9dbcdf6e1cbf341c7232ec8b20d9ab5c35a800fc47c896df31c0534fc0ac9a33c72e05f97c SHA512 a3ddf9d003d4410c630afa09198e535ac774b49ab68a57512d814c0574cc2a602ee106d7aa1e67f9ed81f00b7ccdd3e94db25eee76eb133b05a380242650a634
-EBUILD libreoffice-9999.ebuild 19514 BLAKE2B 1e87e2b25207d53d88727d2347b853ca778f791c83220fc52d4563e8ddbf1267d0e0e3d587e39ad997d8f6351330ec78a4369756f15059cb0a6821bb83e96b0e SHA512 445c191747de6e1000ccad00f5ba7981e28ff113eb11490f15a417aae40042d94eec748f0f40ff56c38b97e05690604b2427e4ce2c04c96364bc6563ea4e49eb
+EBUILD libreoffice-7.1.9999.ebuild 19705 BLAKE2B 6feb38a509865791e552e526178fb11f76252f5627dad71b60b3a4608a20a6baedc268957fd188a42dee3ddae1e036dd42466678ee40b5be83fb5705cd4b6542 SHA512 7e7abcf0c149cb86b5d6e2145888c357688f568920d7cd33c96cdda5863e99e1a3a8f2755080f91c3340de98628b536aaf02a5c604245119ee60e9f5d7d50006
+EBUILD libreoffice-9999.ebuild 19489 BLAKE2B a44938998e31862c66ac3922816a667acd7661a1091a43c2a37d7fabb808cf23b8872be9c9283d39c502be93574b53c61bf50dfe22c7369c08467165ff75a599 SHA512 723d773d7fe361874057689082196f8fad38e68338125c106f4dc5762e17677213722d927d1b8921ee3bcb0cbb2240c38f3a8d1047953fba3ef75a879c6be1f2
 MISC metadata.xml 1221 BLAKE2B 2cc713dbc6d112ac21f8846f9dad48c09972c0d6846a253773280564cf9370934ec798a1579d894d7679c591045542cf2c8cb8a308bf097ce5eac64f40fda3f0 SHA512 c1ab6a23d6fa4ed6b2d77b08c895f653890998a8ed7fb2fa69251adacc9a96e32c0d1298a2b7c287efe85d37a2707e740b6b036174b7b6e39d37a25e3866e957
diff --git a/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch
new file mode 100644
index 000000000000..c905fabf5b30
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.2.0.4-qt5detect.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 971d7ad440c5..adb01509ab29 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12683,7 +12683,7 @@ then
+ 
+     dnl Check for Meta Object Compiler
+ 
+-    AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH])
++    AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [$QT5DIR/bin])
+     if test "$MOC5" = "no"; then
+         AC_MSG_ERROR([Qt Meta Object Compiler not found.  Please specify
+ the root of your Qt installation by exporting QT5DIR before running "configure".])
diff --git a/app-office/libreoffice/libreoffice-7.1.9999.ebuild b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
index 7ce776f6f001..229e39b60b6a 100644
--- a/app-office/libreoffice/libreoffice-7.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.1.9999.ebuild
@@ -44,6 +44,9 @@ unset DEV_URI
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC=(
+	# broken against latest upstream release, too many patches on top:
+	# https://github.com/tdf/libcmis/pull/43
+	"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
 	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
 	"${ADDONS_URI}/dtoa-20180411.tgz"
 	# not packaged in Gentoo, https://skia.org/
@@ -507,6 +510,7 @@ src_configure() {
 		--with-system-gpgmepp
 		--without-system-jfreereport
 		--without-system_apache_commons
+		--without-system-libcmis
 		--without-system-sane
 		--without-system-qrcodegen
 		$(use_enable base report-builder)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 45f856b59db4..48469b754b1d 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -44,12 +44,13 @@ unset DEV_URI
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
 ADDONS_SRC=(
+	# broken against latest upstream release, too many patches on top:
+	# https://github.com/tdf/libcmis/pull/43
+	"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
 	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
 	"${ADDONS_URI}/dtoa-20180411.tgz"
 	# not packaged in Gentoo, https://skia.org/
-	"${ADDONS_URI}/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
-	# QR code generating library for >=libreoffice-6.4, bug #691740
-	"${ADDONS_URI}/QR-Code-generator-1.4.0.tar.gz"
+	"${ADDONS_URI}/skia-m94-975fcdd755dfc5d57cddbb25857e0c4ac29abe98.tar.xz"
 	"base? (
 		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
 		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
@@ -136,7 +137,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-cpp/clucene-2.3.3.4-r2
 	>=dev-cpp/libcmis-0.5.2
 	dev-db/unixODBC
-	>=games-engines/box2d-2.4.1:0
 	dev-lang/perl
 	>=dev-libs/boost-1.72.0:=[nls]
 	dev-libs/expat
@@ -152,6 +152,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/nss
 	>=dev-libs/redland-1.0.16
 	>=dev-libs/xmlsec-1.2.28[nss]
+	>=games-engines/box2d-2.4.1:0
 	media-gfx/fontforge
 	media-gfx/graphite2
 	media-libs/fontconfig
@@ -165,6 +166,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libpng-1.4:0=
 	>=media-libs/libvisio-0.1.0
 	media-libs/libzmf
+	media-libs/zxing-cpp
 	>=net-libs/neon-0.31.1:=
 	net-misc/curl
 	sci-mathematics/lpsolve
@@ -291,7 +293,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-	"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
+	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -463,7 +465,6 @@ src_configure() {
 	# --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
-	# --without-system-qrcodegen: has no real build system and LO is the only user
 	local myeconfargs=(
 		--with-system-dicts
 		--with-system-epoxy
@@ -506,8 +507,8 @@ src_configure() {
 		--with-system-gpgmepp
 		--without-system-jfreereport
 		--without-system_apache_commons
+		--without-system-libcmis
 		--without-system-sane
-		--without-system-qrcodegen
 		$(use_enable base report-builder)
 		$(use_enable bluetooth sdremote-bluetooth)
 		$(use_enable coinmp)
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 0b22c3bf7deb..aaba13840edf 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,3 +1,5 @@
 DIST wps-office_11.1.0.10161.XA_amd64.deb 228984666 BLAKE2B 2b2a5f2048c0e5b292571875197fa51cc5ec25bd59a03bdedad20513b203bc92ea9420881c87352cbe5a0aca25f386f773bb1e1e250fec5ba774b240fc649c95 SHA512 bdc0b8e8c04a904ed5e8f6ecf332db1217c0929dc845b63f13ea074fa508332c5272d087a0502ed92601ab964936c7b458ac5f37a72049d3a5f579649765285f
+DIST wps-office_11.1.0.10702.XA_amd64.deb 275210770 BLAKE2B 6d008e5f59c47e493aeb3b0518ab0c576e7fd2907e6dc87e9c38ac1ea2fac4f8ef16a8b31a7ef44f59adbfc98c75b07f0f8308cfb5ea1bcd3a0483285691d7d8 SHA512 f198fa180fd048ad80f8737a034f43a802297ebe6c6b1c24132d92d4758d8001c3fd270a7b724b84521682c90ac52e362acf1e285bca6e29bdfd45909c7d50e0
 EBUILD wps-office-11.1.0.10161-r2.ebuild 2073 BLAKE2B 7fabbe26a855ddca1b18f20da07919b52835406f552eab8d7fbe96a30d6d412d89fbc16baaa70bf3195fcc1d5b059fcd35d8ed5a73c72ba7db77301324095554 SHA512 6b612a1c97b65a9d624c01029626829a667d15f88dce5221171fc6d5251beb438bb4beff41625e624f659886ea6ec1ac0bedf164d5aa0251c2c2fffe364404ff
+EBUILD wps-office-11.1.0.10702.ebuild 2091 BLAKE2B 22da6d0a8c25f60bdcbb9ad0036e96786dad9870e474a90174d37dee6ed22540ed3cf3eb3e4dbf4e5a707c817ab2a7bb09bd4324107fe41d0804ece331a36094 SHA512 2dd8d6bab8720689b2e024786ba1540a3dd73b2bc78b0be0bf60f563a2d7116b1ee97776c0b31b09089f57c7c47570e2d386a6a18f1fb8f7ba2ad12eb269ba9b
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/app-office/wps-office/wps-office-11.1.0.10702.ebuild b/app-office/wps-office/wps-office-11.1.0.10702.ebuild
new file mode 100644
index 000000000000..30f4b3f8942c
--- /dev/null
+++ b/app-office/wps-office/wps-office-11.1.0.10702.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit unpacker xdg
+
+MY_PV="$(ver_cut 4)"
+
+DESCRIPTION="WPS Office is an office productivity suite"
+HOMEPAGE="https://www.wps.cn/product/wpslinux/ http://linux.wps.com/"
+
+KEYWORDS="~amd64"
+
+SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
+
+SLOT="0"
+RESTRICT="strip mirror" # mirror as explained at bug #547372
+QA_PREBUILT="*"
+LICENSE="WPS-EULA"
+IUSE=""
+
+# Deps got from this (listed in order):
+# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
+# ldd /opt/kingsoft/wps-office/office6/wps
+# ldd /opt/kingsoft/wps-office/office6/wpp
+RDEPEND="
+	app-arch/bzip2:0
+	app-arch/xz-utils
+	app-arch/lz4
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libbsd
+	|| ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 )
+	dev-libs/libgcrypt:0
+	dev-libs/libgpg-error
+	dev-libs/libpcre:3
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libsndfile
+	media-libs/libvorbis
+	media-libs/libpng:0
+	media-sound/pulseaudio
+	net-libs/libasyncns
+	net-print/cups
+	sys-apps/attr
+	sys-apps/util-linux
+	sys-apps/dbus
+	sys-apps/tcp-wrappers
+	sys-libs/libcap
+	sys-libs/zlib:0
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXau
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXv
+	x11-libs/libxcb
+	dev-libs/libxslt
+	x11-libs/pango
+	virtual/glu
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto /usr/bin
+	exeopts -m0755
+	doexe "${S}"/usr/bin/*
+
+	insinto /usr/share
+	# Skip mime subdir to not get selected over rest of office suites
+	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates}
+
+	insinto /opt/kingsoft/wps-office
+	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
+
+	fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
+}