gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /app-office
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
20 files changed, 706 insertions, 38 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 5737c5c42dd2..349749989421 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 31663d0472bf..ebc119da752f 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,4 +1,4 @@
 AUX calligra-3.1.89-no-arch-detection.patch 404 BLAKE2B ef2ea38d3fdabedd98eafd4b9526a3dd5a7c02f4af8109301f3535969475034795483cfb0fa1f1ddad9fa41ef81409d39bf3a06fb781016217355be646d1affd SHA512 d97d2a26622f43987446ac87b14952b9e46f3b919c84c6ada4b18ebde5aa94e6f69b931ec5d61ab391f9a4811e81eb11f2136f0a3384f644679c0db87943102a
 DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
-EBUILD calligra-3.2.1-r1.ebuild 5181 BLAKE2B 03809362aa6711ce9fe713e29be6d4f668927fb414f4780a0340a5e322d6a4647b323743dafd62d66e4fcac7a06dab58414445fb73a3d83e9b13770376ee5e68 SHA512 33c6b71d017c7770aecc3a8fffd71d4796b93f4ba8c958a12705dcd7854e8e543cb9ba552d003cf111f56a4eb6d6313759b11ce9464f227f66512b76fa5c57db
+EBUILD calligra-3.2.1-r1.ebuild 5188 BLAKE2B 011a1d59329d4b04a2f1a41d576f729b46894c7ec112e79c2c53267c8d3ad0e4ea73f4306f344b79d4168acb24c75f2c5839e2f6e31f3915add2a38a57bd5852 SHA512 3c94ad95bdec851b971b7f52a3163f450b027a1ad03a3dfbb94dd579f94d43778a54f6f416234a9f36cdf7acd9041332f1d70112b6514ab4ce93c9002ed5617e
 MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9
diff --git a/app-office/calligra/calligra-3.2.1-r1.ebuild b/app-office/calligra/calligra-3.2.1-r1.ebuild
index ac8c65551999..fb5388edbf8b 100644
--- a/app-office/calligra/calligra-3.2.1-r1.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/"
 
 if [[ ${KDE_BUILD_TYPE} == release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 CAL_FTS=( karbon sheets stage words )
diff --git a/app-office/homebank/Manifest b/app-office/homebank/Manifest
index 285c30809fbb..288657f37c38 100644
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@@ -3,5 +3,5 @@ DIST homebank-5.4.2.tar.gz 2974448 BLAKE2B 0b6f6ad57633ecf560f821295797e9bcc83bb
 DIST homebank-5.4.3.tar.gz 3014659 BLAKE2B 7ec6aa1c8bdc7d26bae8ae751200a4ad9effd9aac08bd39a1969897d7904468f60606307be1b6e6587a662fd7874c8f73460e559c6d06820056811dd4e8fb85f SHA512 e2b3b45a6d35205c3d2bf24d4c0c065889fa4e7d92cc9551db873b8b33cc15e6c1dd721936b438db0725509233bf265446b0512e23973cbebae7af4a7dce96ba
 EBUILD homebank-5.2.8.ebuild 1001 BLAKE2B d6ca5ee5fb7c3159bc737ae6918f1b57309273c496dc44b61f1be2a05ac948c110df1236ff2350ac2596ac584830d4636bbdb99547d535d22a56db168541d615 SHA512 44e549cb811ea5777ce4f465dc1dafee371a9c3b10772579437f71fc126e07257ad83b508fcf33fbd01e73b920cffb12f67ef37574d23a8bb7910680ddf708be
 EBUILD homebank-5.4.2.ebuild 1004 BLAKE2B 67a26e9c8dad2696d8fcea1268e0dafe783ccaa2018ae8195cd285d5d32b16f5f08b7c147035b658d46a09c860a97b03637d58f15e4f895d0ae540c77ae31d02 SHA512 95ed79521cb3ceb84557e65093d0da96e8e8ffdb39b30c8fbd1de1ab16a171f8dec4c8b640ff676454d7acb44f5813cef89c3e3658c8d5ca00f7f5e1c11b1438
-EBUILD homebank-5.4.3.ebuild 886 BLAKE2B d2b471e9288bd6a0e2339bc08aa14f4502487c393554ccbc6a05abc61cabfefe997f38d73c92019a36c59f89e12aff759122642465f65ed0b4dd2bc47944588a SHA512 877b7d60369f53cab2064ae93f17c75847b322a7e94f3c2e95a0170871dca9466e114c1fa1452e8a4f7bc0661f0509f9bb95f6f67bd3d156d0d7aaf7e9dfded9
+EBUILD homebank-5.4.3.ebuild 883 BLAKE2B d6d1b5caa1be46c441ab5ecc1219fde86d183f96e4148a3e81fcadea82641d9f360682e90b3d662097595b9cce98387f79d722bbffca5c93da585bd3678fe9de SHA512 d007f929c29906c9dc0c88b074805b9b296adbb58db8009d5d2c4b240b504b69aaa23be0bbd0fac1084c1ea4c929a804fda04b984b0a74e3f47ba1b9373e40f0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-office/homebank/homebank-5.4.3.ebuild b/app-office/homebank/homebank-5.4.3.ebuild
index c6fa624fa773..6d469b984ded 100644
--- a/app-office/homebank/homebank-5.4.3.ebuild
+++ b/app-office/homebank/homebank-5.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+ofx"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 RDEPEND=">=dev-libs/glib-2.39
 	>=net-libs/libsoup-2.26
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 18ebff1062d1..3351d47516ff 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,14 +1,27 @@
 DIST amd64-debug-libreoffice-6.4.7.2_p2.tar.xz 1110439052 BLAKE2B 54aa720a740c94d146fe2ae8c5ba11bd4e65efbbd18188bbf6b7aedc88a3d8907a18beb74cf901cc3fcf7b7053816f5c3b7c08c1513ff3e9d3e8130fdf995a28 SHA512 f3392bdfffb47abcca83ddc50b0fb3f3cb5fdbe6f1b70d4dd866cca4586a61def6c21439ea34ae8bf758bb3cfa77ddaffe0f4e9bfac5ee3ccd354bed24e14aef
+DIST amd64-debug-libreoffice-6.4.7.2_p3.tar.xz 1110393216 BLAKE2B 58ad318a09d4759b73c986900e4303c55f62c493dac6a54dde770e96ff4c30a2e2108a648c0d3182c84b096d58ffc10eb240d3b498c3ea5ae4305fa84de1e00d SHA512 7f76bba61fee7f8e5a3d30b7d7ec08a5c1ed25a7f4cb057689310d03b8c15006b742b01839f8d33c1ea8e51065f6fa2f4ec2641c338cedfd942dfc36423cf445
 DIST amd64-debug-libreoffice-gnome-6.4.7.2_p2.xd3 1136937 BLAKE2B 49749de74736b6749ece897dac2f7f1a4ebbb2a3cdce82b27e3eae8ae045dbc9b4849238e8ff8631a0db9f1004cc51a2ee00f34f4df82a118982a45f3474e1c3 SHA512 372e9173f269555102f7e5fc7f2dc6c668ae6d4c18eab9d2e96e6b28db056a9ed12a1e7aca18094ddf54419a26ea1aa8b12b40527c29f4d146b3e4370f9f6606
+DIST amd64-debug-libreoffice-gnome-6.4.7.2_p3.xd3 1136174 BLAKE2B b4a90dbf3cb53d5c356e4bd7ff69eb75be18bf496e768277e95737da2ebeffc9b2d2cb465aba2c4dc3b4a376e45c857c64b4b240847b24e82e94529572df4ac2 SHA512 e8f58b3dc0b248e1bca704b84545665bd9a59f528f834074e4fbaf63c2e88759dbb0468892504dd056c887cf504ed349cb8032a001df63d5294f8434c73e1ee1
 DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 505817824 BLAKE2B a911ebe4fb2f0ab5efc644b41c966cf18d9904bd13cce8fbc8c57e8cf2433a5a43c2b6fd7bbf3cd957c82153518932b5e124d11ca5711ff195a2089ddc8bfc10 SHA512 11138384e355e08fd5bb98fe5a0e4aacbd02cea53b0c416bb78e2406b604f6dbcc839bc5b6318183186a2e04e1597e56dbf2267e0202e9d2dbf54d4f3b523e21
+DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p3.xd3 505625604 BLAKE2B 62222cce0da41ae7379a44a1bdf2c11fa8972567b62d34a8152337e9dc2ab1c3a354e8f862ee0774cc26c892fea65c538e8c6ab492040145c0264b5ac2e7b82c SHA512 3a5512c2d8bd2553127c1b21cb0da69b53febe6874680927676e55c180cd76f1575eb3fa07d408090dfb831d44dc2739de7bd738f891d8a31b240f152d785494
 DIST amd64-debug-libreoffice-java-6.4.7.2_p2.xd3 504686001 BLAKE2B 7bb5b84f06c91495a1765e00d54ef933aa73e237a3c28f4c87956c34577cdc6e5ca55a19a287a43c21f42b218c41d0c7a5fc0ab698fbfd6163a026ca00af9447 SHA512 008e79263223f430acbf2f3aa29050319de8ef20e5a2d50c424eb644bcf3e3103e0a2fdb2b566d25b4e266e7a70de693b596266c849510c641d6f1bfabed7f79
+DIST amd64-debug-libreoffice-java-6.4.7.2_p3.xd3 504497844 BLAKE2B b3b51a0dcc5ca3cc67401762ad696d751f03cf9ef33c9d939aab46cf2d26e7a60b60480a3ffe343f1928ef7b5e4b3b16af1cff132af55b59e6ae8ed6cc2a8dce SHA512 7153491a740c53f27430b62dbe5cead8a06c9520c535b913f76eb9fe09b043504c5a0d4d99dde728c13ee6be2656e7ed9298001bb7dcdebcc7871e0716400f57
 DIST amd64-debug-libreoffice-kde-6.4.7.2_p2.xd3 294278544 BLAKE2B feb74b38abb5d8f11442d5437c50a1e33f31aaa077a29a908e083936afdbc9a8bd42fff035f587391df510c9af4a481b4625783e181a05f66d7f1661ebd2a634 SHA512 ebf44dc2af818b2190dfae1d418b1a3705def0dfdca59cd01957bf2b6687a1d64814d755afbb1215300d49c3efdb16fd37650fcfbf2ab164bbf981e7384f389c
+DIST amd64-debug-libreoffice-kde-6.4.7.2_p3.xd3 294352306 BLAKE2B e40cd9d1a2edffef0c9fc7de97eadb8f45eabd8bb3cefe323669945e564624ae508bba4a082ccc10284f09557e848f2eacc03c990b73eb17195f75881a5602e6 SHA512 e241964a062ebdf4ab869f72647496703b1083ced67d74eb6eb4f92d5812716c212c3f4bbdeb2f27542749c0e9340211719c1526a8d19d3820924574f477399b
 DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 512988426 BLAKE2B f2558a4d962e991ec18ddcedbb8d25c0720f6cddc02f542695c5623ae1ad8ea76896139749620c96d69bce76ecea1d1ff7985ee3c0907705f332e4a67b3701cf SHA512 84a1d7ebb4460a9615863e0136a3b6d2acac5dbf8d3812633142a1b3092fbc324570dd3e0faf9f3e55e25001d308b0b03bc0217a08f9c1aa90479b6705ec0251
+DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p3.xd3 512913914 BLAKE2B e122e62051a328be51dc0b5e5e136b93eb01e1b1102a8ad440e7483d66984b5b69c8180b2867c2990c3560ab2739bbdafc58ee29a44ac2bff66b220dc165c461 SHA512 c643668a70f4d8c85869784de8ab77336e8b993a39bcc03ba43a8c5d06d1f1848af3b398b2d82e46af55f0a5073b3cb7df454c4e231c80ced1601cf32c3975f7
 DIST x86-debug-libreoffice-6.4.7.2_p2.tar.xz 1108975220 BLAKE2B b5cba545c995462b3281146fc5a86c597157a89696b1cc76c1b249d583223f3e1c9355c8d3452eb59216cbdf2968f73f7e804fcaa675e67d7d310da590c8db1c SHA512 0613735ef4f11cb80cd8589f7d1713c4d6fa7ad8e1dd7a611598e744075afd016b00440a0cb75c107fe20995252a7f01062ddce2060f6825da719e1cb86279a3
+DIST x86-debug-libreoffice-6.4.7.2_p3.tar.xz 1108731764 BLAKE2B 5323edab63fa327a670f2c5427f0f1fa0e743288d55fb89999623e9a140221de757db192449138d3ad2f3ce370f0790fd96dc1497f0d5f0c09317d3cb56498cf SHA512 211203a1691a1efdf4b55c70c08f610bb0a0660ab0ce6decceae9a2c71dca44a4b4010116c0c07de0c2cd9a6543c45d5f8c68612596d65e83ba757886b3ff1ac
 DIST x86-debug-libreoffice-gnome-6.4.7.2_p2.xd3 1134093 BLAKE2B 6d53b91a5c9c37b0bdee0b08f3600403e342ccdd470f508ec374284a0c4e548ad39af554b079619a67a079212ae690098ef4d2c6825733ff57b009db3ac127b5 SHA512 5c2fbc64f88e0e3f6129cf7a3210a16e7edc4483903aee24a73bdfa80896e0a743e217e8566c7352d727f79afe100490d2952cfb3d29345ed716ecaace90d1ee
+DIST x86-debug-libreoffice-gnome-6.4.7.2_p3.xd3 1133870 BLAKE2B ce9bfe5f23700d260f2cb872f3fa57155ccadbcbd96aacbe5e62dd721d6b180a7a3bc7a632fa8dba6405d530d892e4ac8c60b98c66a54bf50418f1687e2fd162 SHA512 598b15be8cc2af87ddd721615e49adbb32b6353ba9af712bf8fe29997420ed3a7b10352898ee2ce76f4b633fa8bfc44bdb1662ba097a28fafd6ab2e9d9e1bdca
 DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 505408886 BLAKE2B ca886fcd42c9f3c2b1e634974e0dcdb18b5001db8cc0015465f6146487d830c4ca5e56d0543cd550a3f19b81eece2cbb9d421716f9203191254335f7724b4df2 SHA512 74c5fa80c9e0716befda497e90405cf85a5aa5ed5d27c129dfd48e65cf123a4d28457e70fa4592a583a0ff2f111ddc6fc6d7481a130f8520d48039b3f267f02d
+DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p3.xd3 505608813 BLAKE2B 912323f73cd169970c9e68ca336842c64b705e96199b05f5703851fcf8afe4e39cc9cb4f9aaf9d808fbb9d4bf0174724276d3f4d04f810adae8fda7c67d460b5 SHA512 f4f5507abd461304abb72c8aa83e8e88e1a442e93978e1c123169911227a5ba55589dc2f2c7de60def770bb9b5baaca2ac7c9de79acbf7568483c8e7a41344e8
 DIST x86-debug-libreoffice-java-6.4.7.2_p2.xd3 504269108 BLAKE2B f89d79891225c5c3c87f006cceffef9f8228990f2dcb9777721dc3f8a1f7988b2c0753b10d03a77ff42090aa9471d4034b802309dfdf4958cbb03ab2b162c691 SHA512 55c1eb19f3f7a0fe365f946f1f46d2ec57437bfda514f3111e63eea284c8cd7e1ee33ad047fa776edf6231fc1f39a6369793d09012204a4aa1c1c687a91d87b4
+DIST x86-debug-libreoffice-java-6.4.7.2_p3.xd3 504464135 BLAKE2B ab5031fbf713a482e2c1672896fa4393830de9f7cfb9eae7d438245ec4ae5b98605d613af6fb396ffa500738604bb0ddce3e29edb92686058ea7cf9c33324fe9 SHA512 df1e7b9dcb7eeafda450512097bf0c0229183a68e7b179b4c5cee254639d0a7ddb2f1db99e2daa7966fe17a46f7d227df9aede251455236c4efcec7f9503aeb0
 DIST x86-debug-libreoffice-kde-6.4.7.2_p2.xd3 285508996 BLAKE2B 5779310599eb281247a137f2565067b829b6711beb7823a54973cc35f31b20ef0c64da29e3615426eb548e6033416b0f2189a17a0f4f0f5435520dae5400ba45 SHA512 d2312309477a96e33c6101e33aa68c42389c191a4969cb4f6378138faeb231c1cde941818af81366da87ef544531a412fea6a402c1c7fdbd3d4bcbdcb99d54ac
+DIST x86-debug-libreoffice-kde-6.4.7.2_p3.xd3 285501269 BLAKE2B be187ba9a98126b9b2f742839eb5ae191eff31cc0918e2ddb0e13ff3a47b1feebe0b45e068ed6a303802146cfae34349ca129fe48fd940276a0735a6b3102ed1 SHA512 8c8c3849873b843ccdd4f813caf0474a1676a32a9328f13f69294159c18fb991914c3cba24d436361f9939de16f54ceab97d3153d7682ec06de215ce629e6a84
 DIST x86-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 504189621 BLAKE2B aca65755c930755d97c64f860160b8c090bb04cbfb48d5a413419a16828b8fb50bc8dd2d42941181f4996733b6c04e351cd6b2017cfb0b0776b0f44baeae3a55 SHA512 e6e5d91fb4e063a0dc432b0d546a0af9a744c33f223c03b583a223e5d118de0729fb717c8b580252ee142560522bdbb5ea970755a79d768da5048d528a25c8b3
+DIST x86-debug-libreoffice-kde-java-6.4.7.2_p3.xd3 504466811 BLAKE2B d18dfd7a45b101faf20792d3f91ec747d56076291de20b640719a28b8af8718c7d25a313e3108b2964949e639fa3917b6e3798caf614004bdb9f39b17d1dba22 SHA512 22b56e8872d2270a45f87dd4c6cd8edef3aade2b278fa0f546fab0cc9ac26453d5e5f1c8a6450283d282f0afa5e20dfa1c329c6f97ee61e3b441ece44794c5bb
 EBUILD libreoffice-bin-debug-6.4.7.2_p2.ebuild 2593 BLAKE2B 8f7b27ae60e0e21435c08703501f3eaf6deccaa2cefab297b0168bd6ae59cf3a8e26c187b49c19a8a0e7451dfd034a5f79536c1e1638155c6d1eed7e49e9e655 SHA512 37165d409fe1fb1b6b61c55a91b9edce0b11f51cd85f8d0c269c7fe660b37da8bc831ecb67911034312c2fe0be9fe989bc95c69f38372336e895cce6220697ee
+EBUILD libreoffice-bin-debug-6.4.7.2_p3.ebuild 2595 BLAKE2B dff883d37e39ca43d33bf7652358225d75bca6501573ec1eba6f6cbea7ddf47c6743538db10cbddcb810c7b64b7c20044fe1a1cf66ca180fae475d467651a003 SHA512 08fb65d91bb196b7f55c0a303c624e7d4594a34c2a26626e2ba156922acfdb64b743db33988a7fff24f97a6a629f69cd5fe316022c79a74eded40d2717a81484
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p3.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p3.ebuild
new file mode 100644
index 000000000000..48644c566566
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p3.ebuild
@@ -0,0 +1,87 @@
+# 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? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${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
+
+	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 3a754f55e4a4..43dee9ab3480 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,15 +1,28 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
 DIST amd64-bin-libreoffice-6.4.7.2_p2.tar.xz 132899212 BLAKE2B daab7c709cef0298e445e8c2ebb1690a7df1b6bef2932bf3a1d965d80117bc3f5a1aedb293ec7a7c73b61a81cb6ba9d595fa4698636eba066453461dde83d28c SHA512 50715cefdbf6e949b010d449c831387ffe7f1444cdb6f8dfa890113e034401cf4d19774043604475c9ea6fd840f21ed7299234eec742177d82f2b9a3095dee42
+DIST amd64-bin-libreoffice-6.4.7.2_p3.tar.xz 132926632 BLAKE2B c5d249988e973049779a99df2e6cdc51325fa27307b1fdacf6fbad6f193ae4e1edb91ddd9b57f716431f872e46229deef4a71d45c0b341c2545c2e8912369e66 SHA512 5a1a96370d5a7e23700c32fed0be9863da0be39df7a247b4a21b2e2f9f9ed92ba3c97c3514c511587247834dfa6957535c88d41d6187afb0a87d30ebd03b2873
 DIST amd64-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1915838 BLAKE2B 4ac09d0e9cadd34b8bf374b91526763d8059f36faa0e701310df76f01dd471a781e7a4a57eca0458200b55cd73803e44d2fa902bc4cf9ffdc9b7819583f66e61 SHA512 bd6754ba2512f1679ab7a98af007723b5a2bcd64f1813c6a2c2b61c5aef65bee1cfd866016b67a456e4bb2295b3664cdbf73923dea9900aff5b88d5f42baa535
+DIST amd64-bin-libreoffice-gnome-6.4.7.2_p3.xd3 1929541 BLAKE2B 542f8b1b5cca9d64b46e5115266c2e23764d6c7c3617f0385b050fc58e8463172501d49d7294b1e9005a22587b245b754e69b008f66d4fd0b6dc518fcd93c930 SHA512 aa8c649c10122801594b57270c34f7caed7a2014a8dbf9bf9a25b499763c7780f186857382facbafb5b736a665350f2a2154ba4311c88d8ea7171b639edad1db
 DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 29294532 BLAKE2B fc9d82a6dc3986dbb6d68f8d17deb5bb2477ca1cabaa3abcb214800e668440f3b80338767329aeeb1c0c0c9f2793e482d6749021798c8123f1a07c7f0bbf0ad8 SHA512 b6852c3e504a4a37f151d50df92c6f545434dd285e6635791516e279d93b51b7dd7bdd65d40157aaf5ea9d1cd8bdf06630fceecd4953626ebcfe42f1f015c835
+DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p3.xd3 29599053 BLAKE2B bb8adba8d02edaf7fc4dcb95a4c79e41ec7c5e4645fbd4d901ed48492214ff8c03fd1115e8667726c124ba29f546da92b6605c8944c034ed5ee676deeef468bd SHA512 90d9cfff0358ccd8d1bb3ee21a8597ce7e0897b5961c1f844d8bfbe2e2c220561701a2d631c3918f62b0eca7267c24997dd0ad063455c282d348517ca90de9a5
 DIST amd64-bin-libreoffice-java-6.4.7.2_p2.xd3 29174648 BLAKE2B 1349e5db1bde42d695bd12dab39af30b8288f0ac318a662b1bfced9e3b18b67d02bb2d00201b1e8ae40f5f860d02be132e4e27ff686f703c229d1ec3c6de3e41 SHA512 ec281709877764827b9fb481be480b0f1177fbb3a281a6be7fc50a75733cca9d8212d9b2d420ec823605a9e2881a02da8716c482c82d85e7a7d9b43efa3fe469
+DIST amd64-bin-libreoffice-java-6.4.7.2_p3.xd3 29417968 BLAKE2B 4b5ee3ef8d796485cc9db11de96f973ac958dffa4f91689dc0062db7bd0a0cc35fe5fe7eb19574af2b8251b1aef65da21d0858d213c2fcdfdbf16795b11e2734 SHA512 77ce6945d5b748a2485abd70ebc01c9d3dd42b85d9f5a88660db1c3bdaab95f76aab89cbc6881c3095eadfc8d08fde2b000365e434be6193553a64955e0c87d3
 DIST amd64-bin-libreoffice-kde-6.4.7.2_p2.xd3 19690260 BLAKE2B 902b28eaf17c8ba8eb2496674c1c03fa7317eb7eb5455c0650752f9f0313a1b18910775844ab26933aa95d00be57e4c01b3c93f8a0d7dac15198e56138ec404d SHA512 356014519693e5ca73761f13720abac5e8ff715cd9939bfc50581892946d073664753c373ef501cf6bd407cbce7d85fc232eeac1af3fe5279f65f10585e07635
+DIST amd64-bin-libreoffice-kde-6.4.7.2_p3.xd3 19726501 BLAKE2B 52f1335998b47b9e586e408699d8dbfc7371e27967860c11d4141e8ef68ed13db32977999c739a3223f9b52a8491a3b3e532e232674ee499fb9f2fae4226ed93 SHA512 cfb1d9c1046eac6239322a3abce394e02ff1619710c87e2ccf6b8e2e5be3f1c943e165344a9134cad9876423a37e9148ab3b15217a41c7f0680867b7f0ad55d3
 DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 29809537 BLAKE2B f975c8bb30067a97eb6fd8b7a13b95e6788c5593c7da7eef870dc52ac1d7c3d7c8d3dfbdb92998f88cd69f4578044ed783477e072f1aa4f91cedcca362c467c4 SHA512 802326419d9bcf88add3dd0712d1feb2c8663a9663c762dc1d08e28cb577e4aa0ac4800ef27b39dd523729df8edc069098a69c25f57b461ba908a4cd2064bba3
+DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p3.xd3 30202629 BLAKE2B 95ec8df939a656537b86d7d3054cc28213f11b276c5b74b20b6b63773c6ce0be59aee9d3370ce4c66219d55f48521ac1ca11622a1ec8082b59069645e94cfd80 SHA512 929885d21ea8d1e61e3353e2b26554711f61111667d20fc34067fc5e7e11a2137539ce0853e9ffceda9498d556ef1e2c04e7518b6083b86d824f6980e0ce4701
 DIST x86-bin-libreoffice-6.4.7.2_p2.tar.xz 134593448 BLAKE2B 26b57979c917dd379c590891fb630485d1ba51eddc18407fd2287de03fd76403137c61a8e8b4a49a2a34c71638b15918912187eb0e7a682ca4b338467d376a77 SHA512 62364be3d5513247d95c839a90643bff630ddc075b6e1c1cc9fe46f8c98338f93fce55c939913417423c0f559c697f1156e2d4a0448f08501b23f65a354d82df
+DIST x86-bin-libreoffice-6.4.7.2_p3.tar.xz 134564388 BLAKE2B 8de9bcb052136d1280795831a0a273f3f91f644f721263f4fd6b1378ebb407d8a5098e11220809f31626a0c8b87c00471053eb2b592cb2fb466753ad9bf50c3a SHA512 b80eea595111f80e8c3742d5c2f299514fe5ac7a32ccc0e51f22d78fcc6652bc26bb2cd65e52e377cb15ebcc9ca63f881a5835cf3445d6a73e691f833606e7b1
 DIST x86-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1892727 BLAKE2B d1cf2b679a91dd5c1947ec60be83fde839159f5b1e514925b90f47cfc28bf0a902d22c4d57834e9548f8fe6867a1452d4d42d098ac08a8632d341110fa550691 SHA512 d9ef6b5fe1b60fd4085feadb0b7f00ea239d4ce86828db7a3f2d07a89dc1bd879d4d6e2e5277a6b98518dd2c52cc692b1b84b74964ee287a1d9e749e6a47ab8c
+DIST x86-bin-libreoffice-gnome-6.4.7.2_p3.xd3 1909501 BLAKE2B fc56ea80fc2136049f37e9e5d23707d3c67fb0c5b5f07da4081deeec601714d06d3d28e6daa5f7dfe4e67d3142327f25bf1f4f54211a37846c7c8ca94acc81e0 SHA512 3e8a4fd3ac127c1ae6b9a78ed78a4dd767d08ef0fba4bdb1ceb183a101d9b9a46dd5c2dcd931033bcd732163053bfd1a0cf26742d3ef3f8f22d5af45922c1524
 DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 27275582 BLAKE2B 4b91ba882e76747227f780b505ca691d7d5dc2bc2a1d3a8305b43248df595e4c429769bc998724dbbd8d0949951b2fb3d19b00f0c76339ee15182bf5193e95ab SHA512 e62fd9d5e7864ef9d7dd745364768e390e3313cee9ea55f021d5f0a12d935132e526c2134c1733c9564622730645c0e1200da9194521f96f5884a678e09391c0
+DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p3.xd3 27103451 BLAKE2B bfebef1f82d7ab7d1859523735afa84f15c5cdd07d4b1c3206279d31c61d3d1fe1d34051fc9f74fbfefeb5b60b170f52c0fd011d9f63a292c054808fa4d81780 SHA512 05647fd328441341697a720be1871cf2b5848791349c8bcef006f8895abdd82a468c6a84a91b8a76803e0641ca8817a1f5c26de104295b15fcbd423b3be125b8
 DIST x86-bin-libreoffice-java-6.4.7.2_p2.xd3 27169643 BLAKE2B b84c5e9851ff563e5ecc9cb0368aba008f3f43cda15f81d832c3a5fec97953665fcba6b3d1231a7bb14effd5358cc0a363567d5cdf1d00265a093c18ec9035f2 SHA512 39f4465c340fd6b70717fad48905e38519dfb274fdd97f9b018572814bcd2e903690f5a627e40eb20eff004a55cd3a8157e2943d90685ae872f8c51ddbcb6b05
+DIST x86-bin-libreoffice-java-6.4.7.2_p3.xd3 26982704 BLAKE2B 0f0a69f86c9751af74205c54f74ab32f7c552426f47be9d7f94067a01a4db7d5c9ab8d226cc563c897ef5694ad823708f713050d01cd34c7c1bb0b9b112ebe75 SHA512 6650495d959e0de6ff9e7f13e1e09b11d2d449c0f78bd8580edc1465d76b0d037d5033f9b74358f20272c224c15568affc4fb190974e2f7046d0fbf9c3d0c044
 DIST x86-bin-libreoffice-kde-6.4.7.2_p2.xd3 17409833 BLAKE2B 032f5b6ca8262443e2d891dbaa8bbbfd8b7a6a2257a40eafbdd06273fc947cd3a9b96cc10334e3a11086fce7ba3cfc5596e767640d1e5d9258f6bf78ad4266af SHA512 d107cfa5310ee9d139e73cf84bb128d91485caf1b51c62168e29697416649e428e0e55cc55d0347ae8e20f4893907e522515e0f5d4fa350417fe9d181de75a9b
+DIST x86-bin-libreoffice-kde-6.4.7.2_p3.xd3 17740958 BLAKE2B b8dc1ba6da19d96b4e0dc6b9c4889a3e50f81575638f952abd2773b44995a68bdcbbe8274c0886ce249ee11a4de73225be8b4e93d014decb8dae396bfe40be07 SHA512 9154c2918e7d725fba7fc43f03d0c4ed157181ebf09f7e08e1b63797a192f75d24ef854483dc5a1a5c110f90688b4edc7bb532f60af4fdf3f5e42b71c66531f3
 DIST x86-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 27721907 BLAKE2B 9ef839325facb31ce7b90f9aae404098d49bf135d9507b1941eb3af2c3f7919783f4bee289549c49041a843d87336bbc8a91cc10a0c72a1d9a48d5dd06ef99e7 SHA512 1965b8b044dbef3f3b02b5fde8fbc2b4fb7890ffb01e337d5471b1886361096fd7a5d06d2955bf6df2a448bd143df4f5263aa203a13d5d92f61e2f3cf4961879
+DIST x86-bin-libreoffice-kde-java-6.4.7.2_p3.xd3 26966369 BLAKE2B 08102ca92e948c920977c0f909657eccbc148906f527da4dcbc5af93d7577862e652e9725fbdba4463adf26a5530328d959dc8a729e94ca1d0a43197e48937dd SHA512 32f5927e621ac23c015449ac485ac452ff5cd07f18e3c76d61b3200580a123111b5a57d3a2d7db32719f91d5d5da6249ec27328d3347df98a4548e60b957180f
 EBUILD libreoffice-bin-6.4.7.2_p2.ebuild 6153 BLAKE2B 8f71751a7e2020eee8fe20433950c3ed95aa835b554cc8a7b7907a3b14138bfc5ef64c6565445642d6566fa5e9f5c6fe374a3dc3aab776f468307835d606dc48 SHA512 c0f72ea9e366f8b10a609c447980a19364b6cf2f2bb10c2a0e07c6f677866a22ca57e2fd97020674ce3f66edea40a340623fc5efdf03362241acba3a8fa7cc31
+EBUILD libreoffice-bin-6.4.7.2_p3.ebuild 6155 BLAKE2B 961c9375f9a422c166a44da98cacf5ef111a595fc8e2f566efa03f7944acc12d279d150f95c076d3bb24e686461c74f9fd0bcaf450df09c6539a0883f40fe643 SHA512 b5372f6dd1d13ae4c5c0601825ff48c2078cc24b746f274ee08ceb8de2ff58419c12ef12be17244378315a98159b481a014d6b88603dc648f37dd4823632cc3f
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p3.ebuild
new file mode 100644
index 000000000000..d8b4dd4cb4b4
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p3.ebuild
@@ -0,0 +1,251 @@
+# 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_8 )
+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? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${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.75.0
+	dev-libs/icu:0/68.2
+	dev-libs/liborcus:0/0.15
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-9.3.0
+	>=sys-libs/glibc-2.32
+	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
+	>=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
+	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.15
+	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
+	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
+		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? ( >=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
+
+	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/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 2b8ce0e67350..82ffeed248c3 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,6 +1,9 @@
 AUX mdbtools-0.7.1-parallel-make.patch 513 BLAKE2B 1f9e2ccebe4dbf4bbf4655eef237da00016fe060a43ef7a2479b6bd83f98f198959fb3101a97ad016c81ab7d09cf006cb8531c675a066bb6e185282cc8e16609 SHA512 946139271a757a8beeeb03a909104bc348cbc081a9ef6dde7f739865c775cce06717de57560a49b5055d5196b1f3985824b80b728f139cf7684c0ba847f4bd85
+AUX mdbtools-0.9.2-unixODBC-respect-libdir.patch 1439 BLAKE2B 9afc3b2951947593c029eeff66ebcc93da8ff34ef5d1cf25d08848fb950b2cafa533e08b682cf1a5f11eeec1dcc6e1d0df2f9712d576ac2f63bb207ab6c16b42 SHA512 08df20d8f60a8a1323685571649c7fa0127fa4a29a9fbbf431d51265e06194017f71eb6c7d186a3160679971ebd7cc64b5c1f2e428c939dd7dd79b98952816d7
 DIST mdbtools-0.7.1.tar.gz 277257 BLAKE2B 3740c543b1ea2e898a96dc1a560fd83cf079d37f5d02805891c5902b75a417c9efbf421346902766017113d447b088656afbfd0297b26655aa07fce973adc216 SHA512 bbad415c59a3f54c11bcd04971220b1370046c5dfd7300d1f23e597615a1df6af850c6f767e78033676d486d87a11c72dfdb141abbee8378337c3fda9a450b75
 DIST mdbtools-0.9.1.tar.gz 158762 BLAKE2B a730c1ea4efceebb494fc69eac5b94ab23088e0c496684fe027b005492168b6639ec3ebc950e09f643e4a1b50017150caee639255e5e1deb5f9a46c0969077ff SHA512 d8383c20c062a759386e80927337f8ed526914fb53095480dfe791d80fe4cc3e19e83627ca9d34986968b282b16b4c43a6302f76c55d3c2545b6e7b625d47966
-EBUILD mdbtools-0.7.1-r2.ebuild 1058 BLAKE2B 5888b1284e69e61cdc5404aa4e7bb965d9e746358c334f3518e1c0bbe9103ead7b2522dd23f1244793cac4d9239622d0be9607eab7d513017be812e0372b1019 SHA512 8db409fa492f03359cc453c3cfe16c705d6d99098a27e863690eb08c5b3fd1227b4c5b58b295ed475b58f422a23774ac51a0e94861b0788001df64b39092808a
-EBUILD mdbtools-0.9.1.ebuild 1069 BLAKE2B 8b939bc4147b8c4c82f72380a05673cc17a1c9b28f739faba13d385d9ea560139a130ea83e9b45d64829ab44fa840e602df0fe72d31bd092d3ecbd2079d1ff10 SHA512 f8ffebe9d0c295d332ddcf6558bf884e3cd74a0181826667f9c235692e8998535c0f8824f8272c44889f729ac1b4b0987c0c6354e9ddd6bc3c28cc886d2b6ce2
+DIST mdbtools-0.9.2.tar.gz 214246 BLAKE2B f62ffae2b084e53f7222ab969aa7f57f65735281383f93aeb025cff38b32b9aa22ffffb819532f816cc45a9156f7136bd9de953b17b86817380123451d51170c SHA512 cb2bddca83eb9867b765f6fc57fb289f91ce4e2e09dd953e338c26f6c4bcfe9ddb53368c4eef6d02927e582c2e10312462b82916c2e956fa269f25a765371d8d
+EBUILD mdbtools-0.7.1-r2.ebuild 1134 BLAKE2B cf15361d03c654a166260cf2c64469d74d6c0085708204732a40e319cf78a1e9e89e5ca9694f80b8bffaa297ac1c19d7d7b76a3f278d58faa26e1f89848b8d5e SHA512 410bb846549dbdc5a99b848847980d2c5a29b2c38e493df38d7162986bde16045c0674d291e944157806df5bdc8bdd52c4eaab20e313bba1e51611577bf04883
+EBUILD mdbtools-0.9.1.ebuild 1182 BLAKE2B df9f6bc65fc09be68aae1e304e14ea9ce16334910404e7da8389b0fc27b253dbde89b957b6d153298dcbb8fb61ca99ac228071e440bb4734b06ca40bf6b9f1d3 SHA512 9a0792c77fbc5cb8436a1f37f543a3ae2abd7603995359b2c77ec1fcd6d7066007934de62bf3d434a18a8023b6dfc2f0044995e11badf7d34ee0a7cdf8063d1f
+EBUILD mdbtools-0.9.2.ebuild 1145 BLAKE2B 8f6696b5fefc19c4ae2f3264ef3dd24a9cef1237db97a6ee545b0a928a444e002f9f2353cfa5cb58e8060805b868790412a49d128d636d780bbaac274987a4cb SHA512 a635ffbb5ad30f6be4816d5f76eae97afb908a427c5c768e49b5b6fd9ff8525d593f3eecee5825ecee42aeab8bea2621b6e9549a2dcea37b03cea33b40b15141
 MISC metadata.xml 354 BLAKE2B fff9791af58b802e3ac40795a7d3c298d70a09cdf3e394ed265411bb98587802fc29e5b670f96b45ef0a03c001efd5bd6a246f46a9ad9f4e55690efb4f920cfb SHA512 dadf070ffc6e1ffc0b55ebc63147b88c74586b9d357ea60e931c676683607243ae1537e607167bebe84267b095637b0380034f617bd5562e5b5011db09f8a35a
diff --git a/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch b/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch
new file mode 100644
index 000000000000..42c62f04bec5
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch
@@ -0,0 +1,46 @@
+https://github.com/mdbtools/mdbtools/commit/686110d2241f02b3242d02d7c4ded9509aacd0df
+https://bugs.gentoo.org/697568
+
+From 686110d2241f02b3242d02d7c4ded9509aacd0df Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 27 Feb 2021 14:33:23 +0000
+Subject: [PATCH] configure.ac: Respect --libdir for unixODBC
+
+When searching for unixODBC, we want to use
+the libdir passed in to autotools (--libdir)
+to ensure that we find the library
+for the correct ABI.
+
+It is possible that we pick up the wrong
+copy from e.g. /usr/lib/ where a 32-bit
+unixODBC copy of the library exists
+when we're in the middle of a 64-bit build.
+
+Use ${libdir} to ensure we respect
+any preferences/information given and
+search for ODBC in the right place.
+
+Note that this previously affected
+us with iODBC but that's since been
+resolved by using their
+iodbc-config binary.
+
+Bug: https://bugs.gentoo.org/697568
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c802843d..7a1f357b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -157,7 +157,7 @@ AC_ARG_WITH(unixodbc,
+ if test "$with_unixodbc"; then
+ 	HAVE_ODBC=true
+ 	ODBC_CFLAGS="-I$with_unixodbc/include"
+-	ODBC_LIBS="-L$with_unixodbc/lib"
++	ODBC_LIBS="-L$with_unixodbc/$libdir"
+ 	CFLAGS="$CFLAGS -DUNIXODBC"
+ 
+ 	dnl SIZEOF_LONG_INT and HAVE_LONG_LONG are required by some versions of unixODBC
diff --git a/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
index ee4183e217e7..f64c8aa4c17e 100644
--- a/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
+++ b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
@@ -34,6 +34,9 @@ PATCHES=( "${FILESDIR}/${P}-parallel-make.patch" )
 src_prepare() {
 	default
 
+	# bug #697568
+	sed -i -e "s:/lib\":/$(get_libdir)\":" configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/app-office/mdbtools/mdbtools-0.9.1.ebuild b/app-office/mdbtools/mdbtools-0.9.1.ebuild
index d88b6b3b98a7..9632418d1e42 100644
--- a/app-office/mdbtools/mdbtools-0.9.1.ebuild
+++ b/app-office/mdbtools/mdbtools-0.9.1.ebuild
@@ -36,6 +36,10 @@ src_prepare() {
 	# bug #770019
 	sed -i -e 's/-Werror//' configure.ac || die
 
+	# bug #697568
+	# TODO: upstream with autotools fix
+	sed -i -e "s:/lib\":/$(get_libdir)\":" configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/app-office/mdbtools/mdbtools-0.9.2.ebuild b/app-office/mdbtools/mdbtools-0.9.2.ebuild
new file mode 100644
index 000000000000..6a6ef62bb51b
--- /dev/null
+++ b/app-office/mdbtools/mdbtools-0.9.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files"
+HOMEPAGE="https://github.com/mdbtools/mdbtools"
+SRC_URI="https://github.com/brianb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="glib odbc"
+
+BDEPEND="
+	app-text/txt2man
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	odbc? ( >=dev-db/unixODBC-2.0 )
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+PATCHES=(
+	# bug #697568
+	"${FILESDIR}/${P}-unixODBC-respect-libdir.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #770019
+	sed -i -e 's/-Werror//' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable glib)
+		$(use odbc && echo "--with-unixodbc=${EPREFIX}/usr")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 4032cbd95b97..e331c4e63b25 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,7 +1,12 @@
 AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
+AUX texstudio-3.0.5-quazip1.patch 554 BLAKE2B 239f468f72655b579b70503856a87230b74da2b5885d1f4d6cc382c41a3067af82bde91a4ec73621a7156b7efa8f65e61e0e567a450438e70db50d2240b5c7b2 SHA512 72dd985ef4b425e4feda3788efacabc33f4bd2b1331a7df7b22c4b05736f27d3851be83dad3569d37a58a69170f13c2eead22333b6da4792975e86e25e304e02
 DIST texstudio-3.0.4.tar.gz 83191627 BLAKE2B a800b369967051a7154a1ec5d00ae735477fdbb4237e6653bf5469c5fcfa1083fa28f56e3e6bda304821084281e1bf02dfdc4738e6762072d7fb43988e029641 SHA512 094fc53cab388d2e5f9ecfc1172a6ae853c04abe746ed03afe8819be3acdf4e7cb2bdf9ce1edda43fda9396c260f2063aa05ca9aae66871505555d7da6c49beb
 DIST texstudio-3.0.5.tar.gz 83231803 BLAKE2B 739a57fa5305ad8044f8fc13903910ee743cac353aeed53b298dd3d50291c4e5b2d2b67db7785305d1f1c71ba805769a57b46374c762efd39bc1a450f1df470e SHA512 240d177ffbd64f51a8f2aa93644cae29764876ed6fdd03733da05ed97a8ec10e21c1f3aebcb05b35617083abf0442b60ffe8f0a89edb28adacaf9ebe40609a48
+DIST texstudio-3.1.0.tar.gz 83232492 BLAKE2B 6e890fb19a51d8f1fdecbf844f674579391cfea4c3e41535db1daca78d24774e085d7c3c7d2c1eae6e7c287e9ab1d465e1082a25e95b95a7b62930a416bd654d SHA512 83d758102b597eae928e68a59035a83d90a950920995dc992a4478f8eba8ccb1f038a01bd07cce2681f354cad735394b2637cb79899d8e89960bae258652b3d8
+DIST texstudio-3.1.1.tar.gz 83239128 BLAKE2B 7aeedba9ec5a404d51e8854a67c2e07f4efdc03882ebe83ba4d5e99376dcac5c906b40f093129106cfbec716be6001ae6c1848f323147289a5d252c713cb25a6 SHA512 b8c843693d781052914f43215ee42c7bafd4bffe676aede966bafa08b4b74616b55a60e611878a8f0188c84d364ba27f86425adfd4e640c7d4390b0fdfcee8c7
 EBUILD texstudio-3.0.4-r1.ebuild 1612 BLAKE2B da5a132b2dc7a4af6874d08efc204e751bff3b57309300f314eacd7e7311268ea7ffe08233b68443c09edaf005b6bf7046f39dc2bd882f15b73d4038f6e8dc39 SHA512 16ef97c412dd08bdc4f6bf307a97c3624507e24450d4844f86b0c55be63c2d2cf364d21f1c2e71e7f69ea97110a6e3428e01adc408aa3a3d1a1881da715e66e9
-EBUILD texstudio-3.0.5.ebuild 1614 BLAKE2B e347b05acb43f36c799b552af1ebdec586514ac2970213767817bbca142e6d2551507ea890205905b03c34ef6c537b9f2a67652599fb32e0576886c7d8c19180 SHA512 c12aff44e1f14de02a4d74223a0783733d4ebbf245bc3c52a6bd5735b91f2a3e56ea8de298e4cf1a8616b8947769d1de45007ade16e1061e819261ec5fac7ec3
-EBUILD texstudio-9999.ebuild 1645 BLAKE2B 2c57811aed2bee50da3757bf949808add3bcc28dac6611898cf34073678e4d64d4625ea74a6a43a2d3292f129e4bbc628e1542ad38e0e7e74e653f8ae67a9be2 SHA512 421e887f27c61b3e95e2fb6fbf749580e1239fd3189094f390740ab037a2c76e0248ed8478c8303607b43917b844b16a83feb76b2795fb0c177f2b1afbc74f4f
+EBUILD texstudio-3.0.5-r1.ebuild 1728 BLAKE2B d92337a8275176ba700df9ade1ae31596037622bf27713f5aaa9af672e82c86802294fdc5ededa55f652b770327b18d730959b6db7ecc54a0b182e12e30402f0 SHA512 a5b36e967193fce6866bb492218be9c615fbfce34bb4aa3ae8eb696f365aba4704ac804be79bc5f58ea5d967b9bf696c2cd5c8e02f30a734c6f7c3e1dc22dccc
+EBUILD texstudio-3.1.0-r1.ebuild 1737 BLAKE2B 0bde46f53e9f4944fec024eb812ee72f0ec680ca53ce553e940c7dea8388e768b50126aaff2162eafcf9c49b928325f5a473518d112ed08b0a157bf9c91275f4 SHA512 14fbbfba5c373a0ada45eb727ef5fcb558fc0171a91e5935affff4d2b751fad48c039e19b0150901bcea88692027b0708e8cc0dc3927e6be25fd5b1ba4840bbb
+EBUILD texstudio-3.1.1.ebuild 1741 BLAKE2B 28f823a8dcb662af2690637539ddb1d9d6be8aba172d1fb37364679549ba0f68f2ca848d52906d6be5561787e03a4601f33fac4e643de588c4149b92007c3b1f SHA512 745fb3ed7aeea744c4d5c9c50f71d85ecf774e576c9ec521aaed123714b4f0ad0a6b06edba801a37b418bc879efddb2636d9adaa85b29ebdf7c417afed578a7d
+EBUILD texstudio-9999.ebuild 1654 BLAKE2B 4cfbbb1fabba6c923fee9e1a8bd70c3226f4f70ce6bec0f88edb91c34259030a020bdee025d78d12f9d66cad808bdf2165c51d31112bf5aa0eb41ed71e955483 SHA512 32d7d6174407756c0141c1d19f3435b577753b7c020302aa0c329b762524c8582bdb0029cf5ca0ee8657ddc90ef09167a8f672255fb486fda798ad730dbd57a8
 MISC metadata.xml 522 BLAKE2B ab0ebf559f01fbc49a42f0c33ba3b5b5b501d9fb406afe208e0c781afc034e0e8aa93643b3c09ace87c5771e41d13d094429792497a2d086d9679d012b89b860 SHA512 b5127e3ed2139b39a49cb091e1cef0d5e2f6c7c25b7b77d01bdb6d314a5388145d962439ddc0ddef9187b660b9affd9bc51cb4f18828a8b86542631a756fd05a
diff --git a/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch
new file mode 100644
index 000000000000..a2a9033abd66
--- /dev/null
+++ b/app-office/texstudio/files/texstudio-3.0.5-quazip1.patch
@@ -0,0 +1,19 @@
+Fix build with QuaZip-1.0.
+
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -369,11 +369,9 @@
+ isEmpty(USE_SYSTEM_QUAZIP) {
+     include(src/quazip/quazip/quazip.pri)
+ } else {
+-        message(System quazip5)
+-        isEmpty(QUAZIP_LIB): QUAZIP_LIB = -lquazip5
+-        isEmpty(QUAZIP_INCLUDE): QUAZIP_INCLUDE = $${PREFIX}/include/quazip5
+-        INCLUDEPATH += $${QUAZIP_INCLUDE}
+-        LIBS += $${QUAZIP_LIB}
++        message(System QuaZip)
++        CONFIG += link_pkgconfig
++        PKGCONFIG += quazip1-qt5
+ }
+ 
+ include(src/pdfviewer/pdfviewer.pri)
diff --git a/app-office/texstudio/texstudio-3.0.5-r1.ebuild b/app-office/texstudio/texstudio-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..375790905ee9
--- /dev/null
+++ b/app-office/texstudio/texstudio-3.0.5-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_/}"
+inherit desktop qmake-utils xdg
+
+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-0.7.3-r1:0=
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript: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}/${P}-quazip1.patch" ) # TODO: upstream
+
+src_prepare() {
+	xdg_src_prepare
+
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i ${PN}.pro || die
+	fi
+	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
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+}
+
+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/texstudio/texstudio-3.0.5.ebuild b/app-office/texstudio/texstudio-3.1.0-r1.ebuild
index b762eb4fbdd4..3a47094b7680 100644
--- a/app-office/texstudio/texstudio-3.0.5.ebuild
+++ b/app-office/texstudio/texstudio-3.1.0-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit desktop prefix qmake-utils xdg
-
 MY_PV="${PV/_/}"
+inherit desktop qmake-utils xdg
+
 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"
@@ -16,10 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="video"
 
-COMMON_DEPEND="
+DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2:0[qt5(+)]
+	>=dev-libs/quazip-0.7.3-r1:0=
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
@@ -35,29 +35,32 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
+	video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl
 	app-text/psutils
 	media-libs/netpbm
-	virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
+	virtual/latex-base
+"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.5-quazip1.patch" ) # TODO: upstream
+
 src_prepare() {
-	default
+	xdg_src_prepare
+
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i ${PN}.pro || die
+	fi
+	rm -r src/quazip || die
 
 	if use video; then
 		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
 	fi
 
-	sed \
-		-e '/qtsingleapplication.pri/d' \
+	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
 		-i ${PN}.pro || die
-
-	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
-	eprefixify ${PN}.pri
 }
 
 src_configure() {
diff --git a/app-office/texstudio/texstudio-3.1.1.ebuild b/app-office/texstudio/texstudio-3.1.1.ebuild
new file mode 100644
index 000000000000..3d74c1d7efa9
--- /dev/null
+++ b/app-office/texstudio/texstudio-3.1.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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-0.7.3-r1:0=
+	dev-qt/designer:5
+	dev-qt/qtcore:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript: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() {
+	xdg_src_prepare
+
+	if has_version "<dev-libs/quazip-1.0"; then
+		sed -e "/PKGCONFIG/s/quazip1-qt5/quazip/" -i ${PN}.pro || die
+	fi
+	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
+}
+
+src_configure() {
+	eqmake5 USE_SYSTEM_HUNSPELL=1 USE_SYSTEM_QUAZIP=1
+}
+
+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/texstudio/texstudio-9999.ebuild b/app-office/texstudio/texstudio-9999.ebuild
index feb15564ad18..c37e0bd19c1d 100644
--- a/app-office/texstudio/texstudio-9999.ebuild
+++ b/app-office/texstudio/texstudio-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop git-r3 prefix qmake-utils xdg
+inherit desktop git-r3 qmake-utils xdg
 
 MY_PV="${PV/_/}"
 DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
@@ -15,10 +15,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="video"
 
-COMMON_DEPEND="
+DEPEND="
 	app-text/hunspell:=
 	app-text/poppler[qt5]
-	>=dev-libs/quazip-0.7.2:0[qt5(+)]
+	>=dev-libs/quazip-1.0:0=
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
@@ -34,30 +34,33 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
-	video? ( media-libs/phonon[qt5(+)] )"
-RDEPEND="${COMMON_DEPEND}
+	video? ( >=media-libs/phonon-4.11.0 )
+"
+RDEPEND="
+	${DEPEND}
 	app-text/ghostscript-gpl
 	app-text/psutils
 	media-libs/netpbm
-	virtual/latex-base"
-DEPEND="${COMMON_DEPEND}"
-
+	virtual/latex-base
+"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.5-quazip1.patch" # TODO: upstream
+)
+
 src_prepare() {
-	default
+	xdg_src_prepare
+
+	rm -r src/quazip || die
 	# TODO: find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
 
 	if use video; then
 		sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
 	fi
 
-	sed \
-		-e '/qtsingleapplication.pri/d' \
+	sed -e "/qtsingleapplication.pri/s/.*/CONFIG += qtsingleapplication/" \
 		-i ${PN}.pro || die
-
-	cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
-	eprefixify ${PN}.pri
 }
 
 src_configure() {
@@ -69,5 +72,6 @@ src_install() {
 	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
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /app-office
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)