gentoo resync : 02.02.2022

19 files changed, 809 insertions, 57 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 538e6bbd57fc..8806c39a815a 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 62ad4844e709..d1077cf773c7 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,5 @@
-DIST gnumeric-1.12.49.tar.xz 18057896 BLAKE2B 75ae1683feb7f37cdff4cb5fbec04b0f241e4590236ea68706180853c1a950092bf0d902652d65288b42dba13c384e1ac364cefb32b9d60c37a9948d9d7fc8eb SHA512 047d625aee3a15dd8881f2e11cc7c67d211d40be86ec018517d1b3140ff4bd031fb2cb86e48f1f6ee22432aa1f39c978bad5fd5bf5c6a1be9aa53411136429ed
 DIST gnumeric-1.12.50.tar.xz 18062104 BLAKE2B 46d15e5fe540cce904de07b263707d7fd8c29d9a2611105cdb117a3acd6693651e588b4d281038b48fbc36bba100d162c2c2ab1be589ea206272155cbd9046df SHA512 d5896cb8390c99fb3871c722116cc085b93b788fab91bf44d24f20228b8290170a0adc906160a6aa46431ae43b04079621c370dcda42658fa9ae3c1d8baf1730
-EBUILD gnumeric-1.12.49.ebuild 2292 BLAKE2B b4ed27e762e99bdfb954c4779b442583e4dbfb721af03cd77567073b3673cfa73e7e4bd3b30a03dc9106b034897384a63225b8c31790227d06192aa156110f5e SHA512 c29a402fbb48e7f566203f3bbc85a9be15a152b954f78e5ca155f87862fab5007a69e90c1b7f4a3b9aa03c04183b04f41f5764721601fc1f814640f9db8666c5
+DIST gnumeric-1.12.51.tar.xz 18117120 BLAKE2B 7d30dc01cda93a99ef8d47ccdf6bcfd1b6b6964a806599c7ade486f9bbfb61a876ef942174425cb2f59e018f5ec95a9df36a9deb0cd67d23e1801c2c289d83bd SHA512 c46164d9deb29831ab059613548743d84cb15461ac363305a28097832eb69d3fbf3cf8784c420c777bd09e32212b2ef6237bfa56ca28a7e08fd3befde9dfed36
 EBUILD gnumeric-1.12.50.ebuild 2292 BLAKE2B 2275ed4505ea2616dc9009517949d38df177f882b6ce283bc79069e3c94260d419f6b22d798a8431f3130a63cdfb565ce80541f8c8822c253158ba9d6d838225 SHA512 77cc54a618e47a3d9942bec85edefa18947c97891d2a60f28b629a554a02d80b8c2a73292f4a2e3385fd7e67df7de37614aa6002dd59118ae911241498aba7ca
-MISC metadata.xml 520 BLAKE2B 58aa1cd3355286a5a2a656625b2e68bc6163186a7c11b3120be145d47f8da720d36d8c226e3b863a896102526286651bd2d6f24bbd5041ccbc9654d231cb2273 SHA512 99e86e698f6251b7994bc142cb2caace2d528805f3dcb09b304317f98d5b28cd4d6f40e32aa9bc850465c1348e7d8af788e211634d1932d1987d212ac6bac1ce
+EBUILD gnumeric-1.12.51.ebuild 2293 BLAKE2B db7d57d45a050d7f3be9d5c929b40fa1d9b896e5d239d18d6d31cc267d3650181060d759117793ac692335c47ddac8e54e057291f96cb0f17d2ac214481ad88c SHA512 104ee61620b59326211a0d8cf89e6c7cebc5a7689c08fbe4e673ac3c8d0f6bb9befb6153d9d0fe5a8e2ec35de4a31598a1ed31c038137f56531c20cc387daf2f
+MISC metadata.xml 520 BLAKE2B cdd4d61e6b2192b820c122370c47ea2ff0c8b4130474a1273f59ccb83d74decccc174632d0a605b17c5d2efd3312409f4afeb45b66adb332b5c5b1fbce305ef9 SHA512 50a15120cea4f1b2cdadac5819bd215175fb4e9e468647f2228b229c1b50fc01c3a35f125b2404ab0c45e4174c028e39873bb91c8a53f7cbb8d0ec488b5c96e7
diff --git a/app-office/gnumeric/gnumeric-1.12.49.ebuild b/app-office/gnumeric/gnumeric-1.12.51.ebuild
index 5614f99ebf37..dbab1a8b51de 100644
--- a/app-office/gnumeric/gnumeric-1.12.49.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.51.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI=8
 PYTHON_COMPAT=( python3_{7..9} )
 
 inherit gnome.org libtool python-r1 xdg
@@ -12,7 +11,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -36,7 +35,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-libs/glib-2.40.0:2
 	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.49:0.10
+	>=x11-libs/goffice-0.10.51:0.10
 	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.24.0:=
 
diff --git a/app-office/gnumeric/metadata.xml b/app-office/gnumeric/metadata.xml
index a5455a10ca2d..e5d956a2d746 100644
--- a/app-office/gnumeric/metadata.xml
+++ b/app-office/gnumeric/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>soap@gentoo.org</email>
 		<name>David Seifert</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="libgda">Enable database support through <pkg>gnome-extra/libgda</pkg>.</flag>
 		<flag name="perl">Enable perl plugin loader.</flag>
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index 5ec39d7f6e81..72fa23433242 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,7 +1,5 @@
 DIST grisbi-1.2.2.tar.bz2 7325947 BLAKE2B 559ffc8c46edc629fd17aa38042a7d9a39dd9c1866bddc86560bae2750a53916a6e0a451dc6e482b9d21bc1d8d493701d656dfa85b131f5f9b5b3c014249dcd2 SHA512 7d627f9ae588c0d5a8235bb86f3ed160a572114ccfec1dce9c7137296e5525411600033ca4e42b242004edddc42f2160e95c18c0c0cd13516cf62486e081acdd
-DIST grisbi-2.0.4.tar.bz2 7506352 BLAKE2B 4c1717b934677b01cc3bb90ff67a3a2cb48c640e81fae40579d7f7007f72ac93f8d0b68fa0e72e41bf383e5be68316d7cc042a4067dfbf5286e28434932c8764 SHA512 755440aaab3d1db82eeca9fce8d63751c8073d082bcff5d97a11a87b1af47e2bbdc44be34270fbad311e3641fbf263f206996833dd08fd1ac27774b28a1fa3b5
 DIST grisbi-2.0.5.tar.bz2 7465632 BLAKE2B c70fd313660d8fbc0d93d86d89f7470564a0865b8423ae0e8a2f40fc1f4dbe959ed37141963dbc5ab9e6154ff71af3120303bd4c6ccc5554d1da75200c6e8a84 SHA512 16535cbdf0647abc60878bc5a21b22d76090d6a5dab89a9e1ff4029eef25f284a627555ec0724977ba01313f33aee06489b908aaa6600a566f86a87b5f33b7f9
 EBUILD grisbi-1.2.2.ebuild 922 BLAKE2B 5ccfffe049917476a6fbd56db945a8c08aa10a084caee25f86f1e46d5be0d128ea85a52f0cb7de3a51d641911533a88393397455e8d033316d1881c319ca9663 SHA512 2fc5986e2d6a32407663e0617422d478b214c1e348cbd97f10254d9c18b9ace971879b5ccd295fe5a6ec97a53233746ffd539f35fd4e771819fac0ec5f4b53f8
-EBUILD grisbi-2.0.4.ebuild 901 BLAKE2B 03beb7048d726a5fba536c2a14b596d20e6d60f2961c68bd746c6e93712c41a7adf1bffd2b90540eaffbf159627bea2a4f1153e2e2cb5cb522b9d3aad537f087 SHA512 687005e88b2ba1a8e47c963557077bed7fbacca6fc518806b460a75ac077bd7125b7f8f62013645b6810c56745cb06d052d284b93c115c9afeb69cdedc8660df
 EBUILD grisbi-2.0.5.ebuild 969 BLAKE2B dd3182be302266545ba6e49c5b0f75e407c52b8aa7b92bd668ccfb92c3a2421067e00b7aa493c0e164e53ef45f76195e9c2359ddebe7d60c4de78d9eb9690888 SHA512 2c2565765646d294bfe119fb4b8eeb9d378b8efabb4699a2632387b1b63667506659f372cba022520dc1d29179e5d0fa3d43bcd1487ad302af0c7e6de37441eb
 MISC metadata.xml 742 BLAKE2B c2404c947412f641f90f007a3564f673edbdbc63c33f22746a1ee92090e159c90b0ae9505d9fffb32acba9ea8c57c868be22fb55d33a2002bc2df62ae5b98952 SHA512 3fd51181edb464480b96bfbaa4323ec1cb00e86144aca4efe2dca39a8523ab6152b88ec9a3e7bf4a07a4ec847cf2683b09e6eb84bde751e7afce14864709e3c7
diff --git a/app-office/grisbi/grisbi-2.0.4.ebuild b/app-office/grisbi/grisbi-2.0.4.ebuild
deleted file mode 100644
index 8dd1a9b71823..000000000000
--- a/app-office/grisbi/grisbi-2.0.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Grisbi is a personal accounting application for Linux"
-HOMEPAGE="http://www.grisbi.org https://github.com/grisbi/grisbi"
-SRC_URI="mirror://sourceforge/${PN}/grisbi%20stable/2.0.x/${P}.tar.bz2"
-IUSE="goffice nls ofx ssl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.5:2
-	>=dev-libs/glib-2.44.0:2
-	>=x11-libs/gtk+-3.20:3
-	x11-misc/xdg-utils
-	>=gnome-extra/libgsf-1.14
-	ssl? ( >=dev-libs/openssl-1.0.0:0= )
-	ofx? ( >=dev-libs/libofx-0.9.0:= )
-	goffice? ( >=x11-libs/goffice-0.10.0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-libxml2 \
-		--without-cunit \
-		--disable-static \
-		$(use_with ssl openssl) \
-		$(use_with ofx) \
-		$(use_with goffice) \
-		$(use_enable nls)
-}
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 42c0a68124db..172bb18a5f8d 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.7.2.tar.xz 1441939592 BLAKE2B 207d3522d3fca71d9e0fbffcc0186b429e444aed4a7495b708526321273ccee7054bcb7cec3138ebe4e20c4921fd78287af4be6ea5077898c4adf0bdf0520d4e SHA512 2e319688317442fad66ff2a77d92ac4b9ed5e2f5b9722a569eecd842a1d38d1fd98dd4b3ac2f9dc5e91feae79c2431da7e4baef164b7248a432406008e2d6d0b
+DIST amd64-debug-libreoffice-7.2.5.2.tar.xz 1468341700 BLAKE2B 6838ec1d4b2e43aaa171b800c72848d9ca8e2a57b4686269c1c6890f87febb2504e591f5eaa4c15a88be4f899eebf836f0146713fdb2e24598cd8ecbab7991ca SHA512 a70c6402b8a4743f0cd0bdd06d4b6974669a7b6853b0269e9872d5c82d767bc251602f963413f96efa6c353c3b6639b9e17da6513ef4d1f04c4f3e900c2cc430
 DIST amd64-debug-libreoffice-gnome-7.1.7.2.xd3 1380242 BLAKE2B 5c69abece7929c5dee0b5c0a37f75bf1006ac6eaaf6d61c77c0e733e7ed7b3aca063c6a949388c6200d09a6a17661a8e95066416f4b47b011c7be786405bf99f SHA512 f08b7bc561ef3e8cbb06ec8cab0f507c6f2a20f2c6ca859b72aebb04d41007eddb1d41a3908129568c34915119bc884005687ec102c123906c25bc1627a0e93d
+DIST amd64-debug-libreoffice-gnome-7.2.5.2.xd3 1374344 BLAKE2B 563d88c5eac92d0c0402a0f46e406cde412b32b790a40b8a8aefd73a31ad5f9a8fb5180e4a518b296dbacfa10e88dd998fa662965fa20ea26b4c1ead83b583d8 SHA512 5e33b1a35f40f62f43d4f10256d3c54ab7d917a08d7e6a18837c26355b3688aea9996b6eece6e7f82827efd99885b242c7749d762568e10fec56fe910d9b35b7
 DIST amd64-debug-libreoffice-gnome-java-7.1.7.2.xd3 731690461 BLAKE2B a2f7af005c86bb754d3bc86d5c1abcb043d78f023adef3f0a3e347dd66e9b8f7bd086014e28aaf2a4cb3c8555eb6ee54171f634ea57f6576ca552cb77306aea1 SHA512 882f62f2557cc39d68de80f15beb33eeea21af357d2bd87d5943bb635734180e922676a0e04d0152a6b3f80d43a3ff8d47efeead59ef1f7d9db23d8b62f792a5
+DIST amd64-debug-libreoffice-gnome-java-7.2.5.2.xd3 753187527 BLAKE2B ad0367bb2a4a0aba4d999724f6386cd469474f9a998748c0eda2f6e1109fa2fb06f7d71a0ea9b1bf3bcb383249b546197ca05bf0a2a63057d81f01ee35b682bd SHA512 7159ae06cb294f4323905f9aaf2c495e735e749acee8960eca9bcf72ca25718cf66c6de2811bfe538b0fa948b427873a42f0ea39af27d19bc306e68d4419ce27
 DIST amd64-debug-libreoffice-java-7.1.7.2.xd3 730327939 BLAKE2B 0b2bee88dacc1c186355645ffcae7aa7f6b96ac0e28f8ecdebcda878133709dddd1f53df955adb64b7e3a5738361a0c661961ed36f7fc7658e4718aab4a1d2ff SHA512 3e417a5d31028f2ffc9995c742d620f96aa88123ad75ffb70d52b12718b83ca56ffee184b08194530753876654a041426c7b9531c1775743dad903a246260de2
+DIST amd64-debug-libreoffice-java-7.2.5.2.xd3 751807644 BLAKE2B 103f01604bd2606566482b6be9b58acae1d82ecbfe035b73bbec87e7f7ddd9649007ea3911ce395987d34bdfb252397c98617ff3c6da4792ae7df9e726ed59d6 SHA512 47e9725f46465680535520383b27e64d29f84df1b6152a312f070f84157e88ca32767a2c2e352623df5c29ed978b624696b217fda943dea07879d2f05e1c5360
 DIST amd64-debug-libreoffice-kde-7.1.7.2.xd3 476280495 BLAKE2B db7457b75111ca0a55eb0cae888f9d8e9322ed882bf5a7786d214c09ba8cc7c327d6cea1bd1a02508d71f25e8a3c29ffe49d1d95845b45c486cb8f9061ae3bfd SHA512 ba216570e618101cb5f09c951600574454bf5d7a124168bfbb5857e5a2a8aff0c6ebcaf97eb546a121814ba99820f845da98081b125d74a4d62b0e1b21d3dc0a
+DIST amd64-debug-libreoffice-kde-7.2.5.2.xd3 460040481 BLAKE2B b2eabce2b53944997367c5158c8c1ca7bfb2e82e17b58e9142ca3bfa53fb3c848eb719f0e8b11cf3967ff034ead48548f5624a449bbb358eae247df5d1da9639 SHA512 734856278ef502f638e85a2da731e39e464ee7fce13f598f8e01fd8ff3ad7deb4266c1c9249c072bf5b28814ebf98dd57afc9c2f808471a77232769aa4649527
 DIST amd64-debug-libreoffice-kde-java-7.1.7.2.xd3 734480017 BLAKE2B 8854d13e7001e40b2202a0bcc149851f600ef5ed7bdfd96fa50d84066819a8425410860125b593fdbedc9dd8443a759946a15586d683c08bf4a55e56a9d3ed56 SHA512 bbff8c1b3c3d01d0b33967dcf40f36d5a746ba373cef535431047dc7eb4c3437c825228a62e6fafefa3bbca4c68c39b322a9de0c7ac5264efe3fcf0372346e58
+DIST amd64-debug-libreoffice-kde-java-7.2.5.2.xd3 756364946 BLAKE2B 62606d4852549494f1907490453c7c2d51b45f8c237a875aca0cbe68873bad5dee4a8660d7477477eb5695c3dfd9363d0c19ef4cffd238eb2e8b4725199b4783 SHA512 8cf360bf8614da8e88dcba711218b6352df6b90fafe6a3e0e4c5bdd8365fe484161391a6b73ecf8ca2b15694b483754d244972f7069a5fe18acfc58eccb28088
 DIST x86-debug-libreoffice-7.1.7.2.tar.xz 1410535408 BLAKE2B 286a778236dee80a2e8079a612613c0197970847b51a98d041bcf7705ee0b17b0d1489e60e8747ca9aa4b5150928ae020a5d9d761b73e2dba7b59be494a9fdb7 SHA512 050295166f081e5b7f24d100a751862fd4e279a7fb0ab8f8388dd21caa93e60b5a40eb723233c799117b5fa574b9ffec5ead91761af7c521b137e035f582813c
+DIST x86-debug-libreoffice-7.2.5.2.tar.xz 1437665708 BLAKE2B 693afa40cf054bd0a6b84e3f610dcc22147925cc635b671b79812a224384895d15acb8529c5f42ba5ce77891b4383d5f519e74584b0fbd5ee8253f4089a811e1 SHA512 f9e7fc0fc90193aa1d969943986c118af12eee284748dfec689833deaaceaa4c2d716ff54862a901c38a744ee4386ff09bcd78ef3453f40e9ddc609d61185d11
 DIST x86-debug-libreoffice-gnome-7.1.7.2.xd3 1338001 BLAKE2B 15cff9f5b02b45c7eb9d7504476748ff034b34dac599526a20b0538ddc745b86c40953ce7f3b16bc15425b1336e70766fee51f6b4bf778d71171d0f5d619cd54 SHA512 f0eb6469b3cfbd5bd6e76d5b9b225303c52c25dd1c9c3ddb10c1a0cad3df9bd39f1efd814697b4fa4d749189d88b199f0ca0328d99a1cb6f110fafb7d55208cf
+DIST x86-debug-libreoffice-gnome-7.2.5.2.xd3 1332559 BLAKE2B f87725b3bdae2a60f071d44479c1b9f8734661761a91dc328210855b583011a603b66c1eb9842bb3ea55a445028b328950d4de4d4cac91ca0c7cff787ce8ff26 SHA512 d1490cfc5a0d29165393ed36564b2228f84a37cb031410dc533f843743eafcce67b8fc6fc43bac12a010fe6a4afacf65fc2f9327057c30069169a16916fdc1bf
 DIST x86-debug-libreoffice-kde-7.1.7.2.xd3 454011246 BLAKE2B 62ec25f753eacec0a729fd35bfc2f7286a19bd17d97f0463574303e7b9fe74e0d987de19d3956967caebc0efe2fe444062e6aea7a9b2ea8145b7123aceb419d0 SHA512 f6fce013620d5fb1fe96b60e5c41ab61436182751323af354c9b0cb34610c294b175cc131d7e07d472702475b100ea9362086aaa463f0055c304d2a803084f57
+DIST x86-debug-libreoffice-kde-7.2.5.2.xd3 437928491 BLAKE2B fbf1ba96d82cdfb68670b2e1be55b4c9f26b4b0dad77e2b524433bdef06e8693761918db0547182e9bde59d2474511ebf0f5dda11c23e7cee03a98198d6aade5 SHA512 79c7c31c83b582f736ce2c520041354dc11bd7274701eb26fad93d76090d9d10b443183402b4253621fae35f87b33da3ccd645f5a5cfc27e9e7c001291d07668
 EBUILD libreoffice-bin-debug-7.1.7.2.ebuild 2451 BLAKE2B 6c34f11d713dfad61cb6f2323316ef614fd74f6afd0f0a1cae29d40ebf043e97eda7f50a3c4c9d4612e5a94a76d8018c6b65e39635709bed3a0ea1eba07aed86 SHA512 efae8f71ebad7cba2c406fc798707b6ebb880026a3658e90864954ff7f081bf627f7bcf6cb4b8acc787fa8524c56c863e396c75190eaddb9d48021b25c0489f2
+EBUILD libreoffice-bin-debug-7.2.5.2.ebuild 2453 BLAKE2B 99c1c3f98aeffe7d8c1d4a61153d45c3ca0ed216d1f9033eee5acddd91fc997633847000b798ddc6147d9e4df37343fd5be50a53ef93d4ff27d75fb410509b9f SHA512 7e09f2f4ab869d58298724d2fe00d62863bca6175742766bc6cace310784647e9fec45305c7ef862546dcb72025633f4bfbaed54d4693a1649f6ab0678cb7297
 MISC metadata.xml 482 BLAKE2B 94bf0468867227f0b085d6ca86359e9ae852fb874ed95ffa6d9926cfcdc7173d5db4dfe1a0ed86daec746a4f867d42534465bb03402c5bd4d9ac6bb8101932d7 SHA512 d4f6a8f90659676fa509690059e462c1755e22792efeff0a571d8f04f9f167cbed22d5ce34928a4afbf2fc01bf7ea2b5e8f1a70d4a652a3df9153ed0ccbe1905
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.5.2.ebuild
new file mode 100644
index 000000000000..242e5e7214bc
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.5.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 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 00569a211da4..4ae63a822836 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.7.2.tar.xz 136085032 BLAKE2B ef4493c580726d26d3bf05a289acc2f030ba77f7924bab265e9c74f22f79616b61f3f51380526d934f1e3c9d697765f427676ffb483a5547f0fa79b99de17d7d SHA512 b45503b8e8105ede3e02c32ea50c602bdf79238cdd8e1d7c8abb503538ecfe9d359f59c174666cab3d4621e740525d6e2f002fa28c9f77989cbc3c963cb10135
+DIST amd64-bin-libreoffice-7.2.5.2.tar.xz 141659504 BLAKE2B 3f8004e28c52ba2894d3ab4c643291b3ab307818599ad17af062a7cbd6d0ce096fae610aef955cda730344699ba6d025d532c95233b13c7d4083bfbbb227e517 SHA512 4083a0e6c0321478453eaa3a4fe5473325dc375900b3631876cb1695f4b6f6e81b2c79045eab92d76ddcea13ae7100f115a3f2b7da86afa20d4ff1ef67018dfd
 DIST amd64-bin-libreoffice-gnome-7.1.7.2.xd3 1468305 BLAKE2B 117776d451dd580af3448fc109475d09fd4f8cec2e3d7d8d2b628a4bc469aaa18b96c1217e69a43197553b373a1eeee314100ba90e6283c938cbaf9f8029f667 SHA512 6a989daac6215de1029136b5723bdead79afa3f420d4f4a1149c31ce1a6ec69a38443f7ff74f9d87cb594895810009a110a758323a3ccf1d1f8c7160377aacb4
+DIST amd64-bin-libreoffice-gnome-7.2.5.2.xd3 1454525 BLAKE2B 2037e87a38b2cd8d30583b6145c99d884692e053f3e0d7002a2e8e461af288c0a122786ecfcd9e82a6c5c4f4bb98b2c59474874eed23272fce66cff9d282e68b SHA512 dbb2c1f5ede93d3ade9932ba1c0f4709e54280f171cf7a6efe1ec67a716ff6370f994ccc3ac62432d3503b9cd840027cf4b865ad31ad095ff2614f4ea93583a6
 DIST amd64-bin-libreoffice-gnome-java-7.1.7.2.xd3 31065813 BLAKE2B c7a561fb69a79a5da02b52db989e36baa2e158cc81b4a03c77484b0191feb6a4b21aeefbc17a5242c0b8817483476ea089791d14682f342d30bc44e587aff004 SHA512 71b8b0ccc93bef2da88c481c6f832147f542af41d9858ad4c7763de6b35fa95d971db28609a6ef0d03bd98b5c27d23e0196889b94f9150ff337853ce2b4665c6
+DIST amd64-bin-libreoffice-gnome-java-7.2.5.2.xd3 30819131 BLAKE2B a6cd99dbff624338c33cd00fdda1b010acbc2a5aa3d0025a8481bd047d8f74235e5026421885244fbd800fd8af4d4218d4dafc32afea10a48e3171e60109cdf5 SHA512 c9c0266ffd557c6551fd663d7bda186d9a434fea4c7e6fc26bf3d2afa3eac74191d3837dd49d4447209c53baf18c6fe3394c2362c5d3e011de70ba75332d8237
 DIST amd64-bin-libreoffice-java-7.1.7.2.xd3 30876880 BLAKE2B ab1eebacd6f338a5d17a71f04fb04ee485fb68cac54bf008b58675013c77dd0be407fa053a48821d6fc98ebd2f22fd58a21f4c646c49d5c31431e073cd308ac1 SHA512 2ab214cb5f776d15b420adee25ae529acff785735e0f3af2af700769952c41b299d4aa2becd8804d11b48c96b7ff093884b62de758e69574ee829a89ce16c8ea
+DIST amd64-bin-libreoffice-java-7.2.5.2.xd3 30704441 BLAKE2B 7ce0ad8b709f6331f94c56b29e45047c320502797fe23175f9c517cad8e1b192e5f8f2d92d4ddaa0a551accf33b587ed6493369366ae4496473e9e666d6df134 SHA512 6522aa848195b602681d972902e485bfcb018e578f8b0a693aea35a0afa772d054b62f3eefb3e53d54c9791fbfaf275104dd2d95e8c7f8b08c5f55a29247e410
 DIST amd64-bin-libreoffice-kde-7.1.7.2.xd3 21776147 BLAKE2B aa3b38ee9254199f3e23241697340650608786db2789723a0ab306b260a27b12a2171d1218434b7cc9d79a39a4335881fc8f1607da46dac643e6ef4f50afa3b9 SHA512 35f016d5b7b06cbc85c754588e074e5eda5f3f0aa92a36659381bff18c493bcb3ee7c2b366364928b1a3716c0b4819b8b5b17013c84862a93331c9bed92287f2
+DIST amd64-bin-libreoffice-kde-7.2.5.2.xd3 20966714 BLAKE2B 9a9503a191259ad054d72582b88e5923738bdd7bf3008493e6064b4fb84973c5763d8c29bf88db438b5772f11b63ad029ee7a32d791a99c640a56a1e1ae94195 SHA512 2ea0bb46e19548e9c24f0f9713d1c9368619d4d83fb8332ee85a3bc72497d70110a2954b93c51411c83b691195a17861b17657884d73e87f5699fb7d8c40072a
 DIST amd64-bin-libreoffice-kde-java-7.1.7.2.xd3 31001312 BLAKE2B 7fa7e30a355cdda02fcbb138a8898fe4251643480e7b82290f50186e57837e6b9ea9f59c7b6314aa9b64ca8a80be3a337e90bb262fb986d93e530cf83ba04d79 SHA512 d680c553f899ca3af5b76bf33d40e548e435016a7b3d5c0ee24cfde57b0ec4ef0362a302123ce79d0cd6b686ea60523e0320e8041e37538e52f68b9c62ce9929
+DIST amd64-bin-libreoffice-kde-java-7.2.5.2.xd3 30833000 BLAKE2B 20b8c90984db7f61f92d4e27503231efd88f04fee92743e1e80f5d5ba760b08ca77984dc63411d10219b88be50b5140ca0bdf161077aeee3e921dcb2e4f2cfaf SHA512 60d065c777cc922b6ce04c7f5a7d5eb7caeb76356cd4cbd574a4a1e70df8eee387898ab98f6c669dbc19d5b615ee31d0a13d50b02cdf9ea0b3ae8d209c0bf8f6
 DIST x86-bin-libreoffice-7.1.7.2.tar.xz 137617724 BLAKE2B 919be7e29ac3f5c6eb11ac26a10b5005ab64e31a8873cdc5eae896afd3b6ca197c18f90d55c5ec2f6e02e1a03e8929076df9f55d78b356fc13f40fc8ac62c5d1 SHA512 ace271ded273c9b081193d7d31a82ee4474c9b070969d9e848415fa47caf0b314342335cf5dac7a14ae758641f9073ad56057dc5d7e3bc6683bf4e2285b6642f
+DIST x86-bin-libreoffice-7.2.5.2.tar.xz 143261716 BLAKE2B e9b147d79265d5e73c4af998808b12c0c07efd23ccc234f49f26db1827b94ef6fade8e692955e36cda8e3a067ce4ac03eb400f92526ef33082c347c2540ccf90 SHA512 b436c2cf330c2770b2bf7e80d8645ad55204b5920d41ca0c8506d3b0277ed967ade55bec1affbc42cb2b28f7723e42ce5207c4d2bdf293e0777eef31d9675202
 DIST x86-bin-libreoffice-gnome-7.1.7.2.xd3 1455549 BLAKE2B cfe2c9bb8ef2b237b8f672c54d2a4a062cf2d4385a3268d17610334eaf43f7fa1c669ae0e7562a4c551ef757a60fb533af14bcde425fd70a96bdf3bbc1090c4b SHA512 63262258b34cd10b0f2adf528a8d3368552c975b6f40cab2db1f86e768d721d4d78ff6559165928d2f6d920daaaee14234abc1588106a00634cc8b4f7b57315f
+DIST x86-bin-libreoffice-gnome-7.2.5.2.xd3 1459128 BLAKE2B 041da1b99e451933ffcf2f9d8652b080c41b3fa0ac31d38c0cd7b23d25e3e519c190feb114c430453107ea402867128497b36bae2467e3473aad68e134b530a9 SHA512 8c1821b788655a337e1dd19d4fb020729befb47f36f76bad0521f65ff96863ff5920e70e0f59c7964adf609603d64f521a61862e9434c85a9f6520aeb173be3f
 DIST x86-bin-libreoffice-kde-7.1.7.2.xd3 20180804 BLAKE2B 2db3f8240f3bcfa1c719f98dd8fcdf9f93bf0e755211d06ffdbb456743dcaba05a5062563c7b6fd0b92e29f9a73c2752e532e7479cc7dc33f608a81fc10025c6 SHA512 0383a87693a09ddea3466ef60e98df2838852cb32c136ffa7c68687f637d7a056f426bd3cf478d6552be511cd7dc3824d95ce070fc7e14bc56f0c46ed19a389b
+DIST x86-bin-libreoffice-kde-7.2.5.2.xd3 19655768 BLAKE2B 5dc888bc468bd4458752200ff437bca544e83b18c4f0de000228dbc1e8a738fb992ee97add1fd2f0f3bdb8896d72eee2d7d07aabec3c301c6e588f2e1a5ceed0 SHA512 544e3a3da7362621b4044a47180f1959080f42fd20c5b5361d09da239c3ec6f2cee2bacbf57dc1e4da6076fca58345a3a8ac1a9cf1f7001140b891242785822f
 EBUILD libreoffice-bin-7.1.7.2.ebuild 6129 BLAKE2B 6aaf4a472f0dd40d7204ee28ffab82b2b815d2ad1e30d754acd4b06e40617a807d22c4b49aaa9166394a435351fc13a6da0d44c30d2f95fedd27ea3913cf54ce SHA512 32d30371dce2e29b9e8eb9f2ec0761d227aefa64ffd2f13109325cbc47bc7e56aea06cca9863ff0c19a75cc460b8116379ee310499ea186c655d334a7093c830
+EBUILD libreoffice-bin-7.2.5.2.ebuild 6165 BLAKE2B 181d3b97562766fb6772160d7a06745f46ddb8dcdb5bfeeed93f6ecb5b67cc821d34ea9b877504fc01d79283f85c2cfb3d2fa18f813944a46bbd4287a1c11095 SHA512 6b636ea722198567d08c0680e0cf3c74281dfa666aa9ff5f9f23cb90e6d4ca63ef8e6895ec41165e78b6cf212e8cd6e75cdada6f162ee25cf9893bc2aa58d185
 MISC metadata.xml 511 BLAKE2B 3ebaebf19d7db6a7e64093e54ae4ce86f14f528dfbc0987c027bfd7dde5de6ce8e7bfdd815e437aff272b7201d298568fa032cfd3292523c00a1c2bef5bc984c SHA512 01ae7e196fa4b7fbca6190fda6ac2e2667b36a284e828f6b329593b517379f3f4575f96a2eecc4a1d74764fac19ba8d7a756a54c04190f2aa17c578705c9708d
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.2.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.2.5.2.ebuild
new file mode 100644
index 000000000000..e44f1a54f016
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.2.5.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2022 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.78.0
+	dev-libs/icu:0/70.1
+	dev-libs/liborcus:0/0.16
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/3.0.0[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-11.2.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.11.0-r1: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
+	media-libs/zxing-cpp
+	>=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/scribus/Manifest b/app-office/scribus/Manifest
index edf48dc93d46..71c28ab672ca 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -6,6 +6,8 @@ AUX scribus-1.5.7-osg-cpp17.patch 11762 BLAKE2B 4f83dd7de919025606068ca5c05d2dd2
 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
 AUX scribus-1.5.8-harfbuzz-3.patch 2703 BLAKE2B c870a6be1a9e2921ff3336852782bb1fbeb51c0fd797de1a59605723810279e4c48ac65bc8abce5a71cdad16a9c62c7d2f0759fa7593bc3ddc70f5f22a6e0d5b SHA512 589e87973d316d8a96d731e649becfe63b24f26bab9e81da57cf8d049b9a0da78a659c089ab71439232fa56019c0cfaea6fbdce3081eb90c2cd07c6c995d740e
 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
+DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
 EBUILD scribus-1.5.7.ebuild 4100 BLAKE2B b2006dbed58cbb72a90c7956d7fc6b270ba309279117a073a004c7ce14645e3bb7a67176ff351a252c131c1dbc56632433002dd8bba01b5bdda6523f907cb8a7 SHA512 b1a23ef9be8fd537072537c2a80710019c0cd0f85d2ed333c0b44cfb3deb7eb4cfbfd50ba8afc9165f4ee4e8791ba91a2d4ac8e98272003e4b4b8a17e2103d48
+EBUILD scribus-1.5.8.ebuild 4005 BLAKE2B 2875954cd01e544ede0ff32287642f48e35591ad74531d8396dfb4b56890038d160602496996736ea7561df8844749c38a5fcb02b2c5490fdce414d2af64d894 SHA512 3f2aa342ce51d088a55a7a324185be88069fac494af37139e64609737b9ce076a75738ebbb8c6d28dc51fe1c868b35544318b4b7479346f1d2a4cadc796a14bf
 EBUILD scribus-9999.ebuild 3964 BLAKE2B 8152771bbcb2b632c8b691b441613103147eb2cdb4bb50765940c20342f33308f01967d7b929ed076cb3be2a012fba00fb47d49040eb1220e2a20e28b76e5d28 SHA512 e3d4884e9f265257a33941eaec56d20cbf0bd0fc0155ca8852db23e54766285d19e4b74017faba3824aeb843e08906dee2387949bdcef73fa5191b16def49499
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/scribus-1.5.8.ebuild b/app-office/scribus/scribus-1.5.8.ebuild
new file mode 100644
index 000000000000..472e6c130552
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.8.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="tk?"
+inherit cmake desktop flag-o-matic python-single-r1 xdg
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="https://www.scribus.net/"
+SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+DEPEND="${PYTHON_DEPS}
+	app-text/libmspub
+	app-text/libqxp
+	app-text/poppler:=
+	dev-libs/hyphen
+	dev-libs/icu:0=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/harfbuzz:0=[icu]
+	media-libs/lcms:2
+	media-libs/libcdr
+	media-libs/libfreehand
+	media-libs/libpagemaker
+	media-libs/libpng:0=
+	media-libs/libvisio
+	media-libs/libzmf
+	media-libs/tiff:0
+	net-print/cups
+	sys-libs/zlib[minizip]
+	virtual/jpeg:0=
+	x11-libs/cairo[X,svg]
+	boost? ( dev-libs/boost:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	hunspell? ( app-text/hunspell:= )
+	osg? ( dev-games/openscenegraph:= )
+	pdf? ( app-text/podofo:0= )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# non(?)-upstreamable
+	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
+	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
+	"${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch
+	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S="${WORKDIR}/${P}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	rm -r codegen/cheetah scribus/third_party/hyphen || die
+
+	sed \
+		-e "/^\s*unzip\.[ch]/d" \
+		-e "/^\s*ioapi\.[ch]/d" \
+		-i scribus/CMakeLists.txt Scribus.pro || die
+	rm scribus/ioapi.[ch] || die
+
+	sed \
+		-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+		-i resources/templates/CMakeLists.txt || die
+
+	sed \
+		-e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \
+		-i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test
+}
+
+src_configure() {
+	# bug #550818
+	append-cppflags -DHAVE_MEMRCHR
+
+	local mycmakeargs=(
+		-DHAVE_PYTHON=ON
+		-DWANT_DISTROBUILD=ON
+		-DWANT_CPP17=ON
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DWITH_BOOST=$(usex boost)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_NOEXAMPLES=$(usex !examples)
+		-DWANT_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DWANT_HUNSPELL=$(usex hunspell)
+		-DWANT_HEADERINSTALL=$(usex !minimal)
+		-DWANT_NOOSG=$(usex !osg)
+		-DWITH_PODOFO=$(usex pdf)
+		-DWANT_NOTEMPLATES=$(usex !templates)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use tk; then
+		rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+	fi
+	if use scripts; then
+		python_fix_shebang "${ED}"/usr/share/scribus/scripts
+		python_optimize "${ED}"/usr/share/scribus/scripts
+	else
+		rm "${ED}"/usr/share/scribus/scripts/*.py || die
+	fi
+
+	mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
+	ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
+
+	# These files are parsed to populate the help/about window.
+	cat >> "${T}"/COPYING <<- EOF || die
+	${PN} is licensed under the "${LICENSE}".
+	Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+	EOF
+	dodoc "${T}"/COPYING
+	docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+
+	local size
+	for size in 16 32 128 256 512; do
+		newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+	done
+	newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+	doicon resources/iconsets/*/scribus.png
+	domenu scribus.desktop
+}
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 3bf133f50953..21bbe8ca718d 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,5 @@
 DIST skrooge-2.26.1.tar.xz 22138584 BLAKE2B 15328406763c69a1a746dc099be815e8c49163c5e99e5d8c985a368b1d629759c519b261b2f06b27e83bb538f6ccbf4a2a2d25ca31262f0e407805639bab7d8d SHA512 03263689310e1c7538acdd133f7b6cfcd67c51a4d426ee4512609408c91968a1369f2ef09da851958c210b4399c706ad35af5b384fcea8ec7a25705a548ae537
+DIST skrooge-2.27.0.tar.xz 22185204 BLAKE2B 803281a5a5c491d696a43e046d28d9e846a1c8fa3456a5f93da1a2697d6d3a3181311eff50a06fa0190a99561f72afababa0d623bd8b93b22b8704106c48a8ba SHA512 d97ecb852c212d880b2ffc441e1a31915318800c06c386773cf9845f88e7ff4c8cefc72508e5d6c46f6bd1fdd93c0e9f2d2249c3ed05a878fd843a0c6c358d51
 EBUILD skrooge-2.26.1.ebuild 2575 BLAKE2B 0445fae5ae7cb96843099fed8146182c3c6952ce3b6caf3c1579e1b49aed73deecf700875903513a686ba6b4b9bd61cfd56f7be9fbe6c44268517431e754b92a SHA512 f1eb690fb6e6d0880649a4676937ebcada9933d218552d60b6942ecdfb9bed419c5866d93f4064fd82fc18eefe9e35b76bc8bc2e796244aab47518a186266236
+EBUILD skrooge-2.27.0.ebuild 2575 BLAKE2B 3603dbbb3dab4996653d30ef9a379a74259c35992a39e7fb34b4de4c44e152fdd01ea18a8e8ab416fa49f9a97dd01e352dc6b2860685306617cf3780cb3d70b8 SHA512 328f31b89fe3d24818949785ba8f3a40e3e77e873c60d9d30174e3f81e74ee605cca7dc3108c1b19435a68eebe128a9878bd017ec2b4ab2ac2973e2c6c77aa52
 MISC metadata.xml 393 BLAKE2B f192bb06b0b86aba02ffc2ade42d2e46927758d90759cb4c4c0edaea49e1aa82a119f073233b0028ece6a3ee976e942cb55becdf420d09c93dbb06230eedf4e7 SHA512 741040cc75c5a4df36ef09ee97fe652501754fca36884f52177936bd7b1a512e5f248e95a3e4c674918f56f76275c41899577b3621aa5e3fb97f18410f109c8a
diff --git a/app-office/skrooge/skrooge-2.27.0.ebuild b/app-office/skrooge/skrooge-2.27.0.ebuild
new file mode 100644
index 000000000000..030f4a24cdb2
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.27.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities kde ofx"
+
+# hangs + installs files (also requires KF5DesignerPlugin)
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-crypt/qca-2.3.0:2
+	dev-db/sqlcipher
+	dev-libs/grantlee:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5=
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+	ofx? ( dev-libs/libofx:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+"
+BDEPEND="
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSKG_WEBENGINE=ON
+		-DSKG_WEBKIT=OFF
+		-DSKG_DESIGNER=OFF
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package kde KF5Runner)
+		$(cmake_use_find_package ofx LibOfx)
+		-DSKG_BUILD_TEST=$(usex test)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	ecm_src_test
+}
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 77706f3f64cf..67da8c4dd4c9 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -3,9 +3,11 @@ DIST texstudio-4.0.2.tar.gz 88557508 BLAKE2B 51c7b80f01e6e657b901d197bae01e43144
 DIST texstudio-4.1.1.tar.gz 88564492 BLAKE2B d3a198b4d355ea0f07391b8ff816baacd03f6d9b3f21e69c4b2303ee9e754e9cf49e3bd7a22b5e1cdd74f463d81f95ffee8212ed89825d9a05b7aa5f13355610 SHA512 eb78bdd565c7cc1c84214975f2e7b6b01e2b00f136eb0890bca363fafe61a540caa9a360c10848b836315d3107775a7a289ea6f02480dbb8c5d17e2d09c0f481
 DIST texstudio-4.1.2.tar.gz 88666134 BLAKE2B 7c4310fd0d8fd446b8844f11c687f55818f7314a2e0614ac26b8023f8fa7e5eca1b60a3b3c0ce61ccb15d383b61c24280a67dd530a907b4b8e00a965b10230bf SHA512 0b88f82514462c363e6dcee899f3681883ce9db1bb21cbf9e5e657208338bba4a6cdb79feeaefb242350bc01b83851c5d2704a7d0e2888034070ef2588b77964
 DIST texstudio-4.2.0.tar.gz 88795988 BLAKE2B da849849d9ab57cb04de63f24e207b03b47393b876cd2762277e00f17d39b8c19a7508df567642faec8a5ac10400d2a6327343b40ab076f24f0bc8bb1b2ec683 SHA512 aff5ae645a3b3c362e0456270576770c5b39212902a37633b7279476cf6278ee292ef93c4a0c917b1d4d513aaf597d634f4cf7a469fd4e918f35ddbbe5cb1700
+DIST texstudio-4.2.1.tar.gz 88906345 BLAKE2B 045166fe73270013f9bff4965e3c1177c23b2419a2533144e069c6cc0f37ee729a816f9cdbc3baaf1ff0f936ef39d6bf5200b1ee89dabf43374860f52890b44f SHA512 2a3e435b7ac0ae2ce317b0de31f525c02bea39917b4ec5740f293109e09325008dfc174da41412c491376226f4cf458bd91e2d92f8b15cf4f3e41d82bc205bb4
 EBUILD texstudio-4.0.2.ebuild 1721 BLAKE2B 99ca4fab9bfa132aa0b40ddc56ac8629f3e89d2479e0e9cc6b9a2d6df31c214f02ef40b62b95722005b6cd321f1c58fa27459e2675b990e6ee5630d35cb04639 SHA512 09e380741881e0e6a7ec6ae2c97236bcda625a66577c4ff448e9dcc11a954053452789251747d35dafcaf8dd801363a442a32292c770dfbc24b4dd77865e95dd
 EBUILD texstudio-4.1.1.ebuild 1738 BLAKE2B b8ca60e4d518b455550ea678db98711ae0cc5a77854f640b426c81f837442d7c476ea201cac301109777f4ca2d8d5d5a0f1238414022e7bce398157c573456ac SHA512 d74b3da403e6a8ccccf24e02abd5ada314ea6fdbf4f989cd3b1bc617a75dfc436362e582c89b43ffff1f254c135b6a8084ff09b35c4b1aedc2684638e851dc5a
-EBUILD texstudio-4.1.2.ebuild 1738 BLAKE2B b8ca60e4d518b455550ea678db98711ae0cc5a77854f640b426c81f837442d7c476ea201cac301109777f4ca2d8d5d5a0f1238414022e7bce398157c573456ac SHA512 d74b3da403e6a8ccccf24e02abd5ada314ea6fdbf4f989cd3b1bc617a75dfc436362e582c89b43ffff1f254c135b6a8084ff09b35c4b1aedc2684638e851dc5a
+EBUILD texstudio-4.1.2.ebuild 1736 BLAKE2B 295f4ffc47a22e1af0e5dc9e72abbd478a04311b4c89ca26dc1fda444e7bdecd51b6885ac463344e8088d3195a0ce418d474f57f26b5f098859736d14c5eeadc SHA512 5e8ff15d72ff9fbb07276edf5db8e864bff32b3ff641d015bd829534cdab9ed70052a6a03213134e420763e0e90d0d354006d25714a4b8016314894aa0d0608f
 EBUILD texstudio-4.2.0.ebuild 1738 BLAKE2B 6c37086bb056e8eb8f00f0606d8e073dccbe280ba1de4d787e805045c0cd05887e35954b23f06721f3a77a7b0330fd4569febe9fd920c5c3029115026a0029b5 SHA512 56fcb02a16038295708bc075f7279dc3795e6a7d48f002f678b6c124783d8ba8cd368b3c43919c8b798393635a3da3280f1b3ef5b13d151422979944d35dbd80
+EBUILD texstudio-4.2.1.ebuild 1724 BLAKE2B 7b937c4f993d58632e6c727eef80e4a33169bfb56b52588aaeee6b3a6f6df931b21286cf5bfda2eb58a09d901dcad28485c2e5336674592522c91873fd6f53cf SHA512 f29ce3c1adeb7212fd8e65787a6f62c15a2b99897b081e93d4b476e01196291eba250d69e395efe61d06a90e2a9569efd8c0b1169af9eaadb8e71963ceb713af
 EBUILD texstudio-9999.ebuild 1661 BLAKE2B 7ab31d156cb4b4a192ebbd96628f4f427ffe8f2f05296292bd3c98590c73110d5022e929df11f009188c347e108d5d460498ce44e243cfd91e49f9d8b2e7a405 SHA512 293d1621312fc9c5fb580a868bd67a43434c671b3b623048e9b93e6093d292e3975b292c1a7f6014853e44f803b0253a87a716ee30fa68bfec251f6dead07780
 MISC metadata.xml 523 BLAKE2B a16bc006c6ab5dd0536e77a5bbe1681cc84c3aa5be50bdb567eccecab426688c751c0bec2c34bf221ec54f5ba772236a81a227067e426bb545755a129ebb6e41 SHA512 91f8748cb661e3e2ef7c027d02aecccbe23cce00c0da8486227d237ee6429e84ac9a8c2b32d4c518a4583d0643871b0c50c838d3c40004c0df7ae9c8ecefceed
diff --git a/app-office/texstudio/texstudio-4.1.2.ebuild b/app-office/texstudio/texstudio-4.1.2.ebuild
index 27eded34899a..a3bb2d21fe78 100644
--- a/app-office/texstudio/texstudio-4.1.2.ebuild
+++ b/app-office/texstudio/texstudio-4.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="video"
 
 DEPEND="
diff --git a/app-office/texstudio/texstudio-4.2.1.ebuild b/app-office/texstudio/texstudio-4.2.1.ebuild
new file mode 100644
index 000000000000..e8fa5c1dec33
--- /dev/null
+++ b/app-office/texstudio/texstudio-4.2.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop qmake-utils xdg
+
+MY_PV="${PV/_/}"
+DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
+HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="video"
+
+DEPEND="
+	app-text/hunspell:=
+	app-text/poppler:=[qt5]
+	>=dev-libs/quazip-1.0:0=
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="
+	${DEPEND}
+	app-text/ghostscript-gpl
+	app-text/psutils
+	media-libs/netpbm
+	virtual/latex-base
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-quazip1.patch" # TODO: upstream
+)
+
+src_prepare() {
+	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
+	rm -r src/quazip || die
+
+	if use video; then
+		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
+	fi
+
+	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
+		-i ${PN}.pro || die
+	default
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1 NO_TESTS=false
+}
+
+src_install() {
+	local i
+	for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
+		newicon -s ${i} utilities/${PN}${i}.png ${PN}.png
+	done
+
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index c0cf83cefefd..382c4248717f 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,3 +1,5 @@
 DIST wps-office_11.1.0.10702.XA_amd64.deb 275210770 BLAKE2B 6d008e5f59c47e493aeb3b0518ab0c576e7fd2907e6dc87e9c38ac1ea2fac4f8ef16a8b31a7ef44f59adbfc98c75b07f0f8308cfb5ea1bcd3a0483285691d7d8 SHA512 f198fa180fd048ad80f8737a034f43a802297ebe6c6b1c24132d92d4758d8001c3fd270a7b724b84521682c90ac52e362acf1e285bca6e29bdfd45909c7d50e0
+DIST wps-office_11.1.0.10920.XA_amd64.deb 276990976 BLAKE2B 31e47f0f5f69ead0e351ed339321ecef7a430c4a54cfa2a1522f2b6bdd325e3ba7e3887185769d52cda1dabbb3df0b3a192f5849f02ef71c7d8f2c26b4e362e5 SHA512 c437aa03025922614ae71f833a6aaa7ca097a77513ad3393243df67ebfe39e194e68cfd2ca4136b319fa9de784365793c22d29addffba4a1e3e11e31845080a4
 EBUILD wps-office-11.1.0.10702.ebuild 2091 BLAKE2B 22da6d0a8c25f60bdcbb9ad0036e96786dad9870e474a90174d37dee6ed22540ed3cf3eb3e4dbf4e5a707c817ab2a7bb09bd4324107fe41d0804ece331a36094 SHA512 2dd8d6bab8720689b2e024786ba1540a3dd73b2bc78b0be0bf60f563a2d7116b1ee97776c0b31b09089f57c7c47570e2d386a6a18f1fb8f7ba2ad12eb269ba9b
+EBUILD wps-office-11.1.0.10920.ebuild 2066 BLAKE2B dbe24b433421146c852e2ae1007b8b4d3d247cde1242f7e82dcf5a3fd51a1e76622e05e548f20bd4544c3b79d9d7ca8d697b9e8e862f60678815c23914e862c1 SHA512 6e7b940c2769d8208d99a67ef2701f4915d59d7fb395a8d0a64225cd66f93d7a2a7aadd11777f6e39c6b8415d950bd0df87e5b92c408652b12e7371298877d86
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/app-office/wps-office/wps-office-11.1.0.10920.ebuild b/app-office/wps-office/wps-office-11.1.0.10920.ebuild
new file mode 100644
index 000000000000..41d7f66bb6fe
--- /dev/null
+++ b/app-office/wps-office/wps-office-11.1.0.10920.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 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.com/office/linux/"
+
+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}
+}