gentoo resync : 31.05.2021

16 files changed, 363 insertions, 374 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 484e876222bd..f519a40f07c4 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 3aafed13780b..3c3288d750b9 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,3 @@
-DIST gnumeric-1.12.48.tar.xz 18329300 BLAKE2B f38fdc14dbe2b45fa3c2ebbfb94d89c85f6c04bdc95b493a760a23ba347fa99d2515f0e7fc0a2f45e31c3f2a3b0c8b425b0fb876f59215e2da76348c5dbe116a SHA512 6c17e95ecd88b43da0f4f23d9c99dad5d0016f9618570a36be5998fa84c144bb5d13749fd9c4fe0c295e3c80d70c717d09763cc9904dfc1df062b96749b73ebc
 DIST gnumeric-1.12.49.tar.xz 18057896 BLAKE2B 75ae1683feb7f37cdff4cb5fbec04b0f241e4590236ea68706180853c1a950092bf0d902652d65288b42dba13c384e1ac364cefb32b9d60c37a9948d9d7fc8eb SHA512 047d625aee3a15dd8881f2e11cc7c67d211d40be86ec018517d1b3140ff4bd031fb2cb86e48f1f6ee22432aa1f39c978bad5fd5bf5c6a1be9aa53411136429ed
-EBUILD gnumeric-1.12.48.ebuild 2291 BLAKE2B 6ec480c124408a9e6c363fd7bd4c51788b9defdd9f3f2fe0300abb9b7c8d8d0dddb89ca9150d29fd3988932b2154346619b996c63fad667d1742b3f17daf6e2d SHA512 727e3d3eef41262f03c01b6241b9f0642f27dea13fed43ce563a908467ef110f999c2c39810395d352dddd28e10b300e3c6e6ee04eaa52d75851eef64259f0e9
-EBUILD gnumeric-1.12.49.ebuild 2294 BLAKE2B 72045253e75071515f84cc8e0efd430a20c8ad7b14f1f9e7d544d3356d789b65e5fc4389af5c3003ec8ae1434fe32e918de4e7bd985028e871b577de05fccf3a SHA512 dba070b374ce5d520b456344b6e90543d3aa7c0f8a1ed1af67d47a0511ada750d192ce6792d4b98c7a98f9255901f4bfe599f2acf3160e14647112e5aab94973
+EBUILD gnumeric-1.12.49.ebuild 2292 BLAKE2B b4ed27e762e99bdfb954c4779b442583e4dbfb721af03cd77567073b3673cfa73e7e4bd3b30a03dc9106b034897384a63225b8c31790227d06192aa156110f5e SHA512 c29a402fbb48e7f566203f3bbc85a9be15a152b954f78e5ca155f87862fab5007a69e90c1b7f4a3b9aa03c04183b04f41f5764721601fc1f814640f9db8666c5
 MISC metadata.xml 519 BLAKE2B 07b0ba6ff606de990d5fb97de46aa20f0581ab63f789f2238446e6f87dc93283a0873dfec3ee4a3fd38372aa3fa17e50349abffbd5eb5cc73d4cbdbffe1e5592 SHA512 a03730e0ccc7c2fb4df57f0d63da93e9254c8df99594a26215ff9919302919eb0bfdd21622b9d73f84011c5cd28397cc0b5b2add2fce0624d7a59fc1877601d3
diff --git a/app-office/gnumeric/gnumeric-1.12.48.ebuild b/app-office/gnumeric/gnumeric-1.12.48.ebuild
deleted file mode 100644
index 58fec4bc381c..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.48.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org libtool python-r1 xdg
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://www.gnumeric.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+introspection libgda perl"
-REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
-
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, also fails tests due to 80-bit long story
-# upstream bug #721556
-RESTRICT="test"
-
-# Gnumeric has two python components
-# 1. The python loader for loading python-based plugins.
-#    This component is pure python 2 and a port "is not currently being worked on".
-# 2. The python gobject-based introspection API. This component is compatible
-#    with python 3.
-# Component 1. can only be re-enabled once someone has ported the upstream
-# codebase to python 3.
-# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	>=dev-libs/glib-2.40.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.48:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.8.7:3
-	x11-libs/cairo:=[svg]
-
-	introspection? (
-		${PYTHON_DEPS}
-		>=dev-libs/gobject-introspection-1:=
-	)
-	perl? ( dev-lang/perl:= )
-	libgda? ( gnome-extra/libgda:5[gtk] )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	app-text/yelp-tools
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Manage gi overrides ourselves
-	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-gtk-doc \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--disable-static \
-		--without-psiconv \
-		--without-python \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl)
-}
-
-src_install() {
-	default
-	dodoc HACKING MAINTAINERS
-
-	if use introspection; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
-	fi
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.49.ebuild b/app-office/gnumeric/gnumeric-1.12.49.ebuild
index 408413f5523a..5614f99ebf37 100644
--- a/app-office/gnumeric/gnumeric-1.12.49.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.49.ebuild
@@ -12,7 +12,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} )"
 
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index a61cc264cb7c..afb5a43f0db1 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,5 +1,5 @@
 DIST grisbi-1.2.2.tar.bz2 7325947 BLAKE2B 559ffc8c46edc629fd17aa38042a7d9a39dd9c1866bddc86560bae2750a53916a6e0a451dc6e482b9d21bc1d8d493701d656dfa85b131f5f9b5b3c014249dcd2 SHA512 7d627f9ae588c0d5a8235bb86f3ed160a572114ccfec1dce9c7137296e5525411600033ca4e42b242004edddc42f2160e95c18c0c0cd13516cf62486e081acdd
 DIST grisbi-2.0.3.tar.bz2 7504520 BLAKE2B 28f9fd2535d3d863a4b36237f5dbb0947631764738a45869ad9c15750235cd741043382041eb40189ccbf34901527b950378e086e6f87a1beeeccd1c64f6be7a SHA512 2fdc93051399be2e7818890a88078f0c18976efe703a4f1ca9177484eb30def0533f35c6b7362b62dc29872596d9bb28494045ca2c137eec192d8c9bdde0e8aa
 EBUILD grisbi-1.2.2.ebuild 922 BLAKE2B 5ccfffe049917476a6fbd56db945a8c08aa10a084caee25f86f1e46d5be0d128ea85a52f0cb7de3a51d641911533a88393397455e8d033316d1881c319ca9663 SHA512 2fc5986e2d6a32407663e0617422d478b214c1e348cbd97f10254d9c18b9ace971879b5ccd295fe5a6ec97a53233746ffd539f35fd4e771819fac0ec5f4b53f8
-EBUILD grisbi-2.0.3.ebuild 903 BLAKE2B daa3df721d49165d8315d30ca3ed2f7d9896c3f99c00b975957ba73d4fcf823ab95932673517b4a6eae5f7083122e9673ab4f3a2d12227aa70e30a57b6f3074b SHA512 1f7c55deecd1afb69fd9812addce46a33623a2adc40fb70763010f5eaa1119b395fc5b88b6f362653791acc3f1e98c3bed93691dfb0eeeb5a5dcc86e6a5e7885
+EBUILD grisbi-2.0.3.ebuild 901 BLAKE2B 03beb7048d726a5fba536c2a14b596d20e6d60f2961c68bd746c6e93712c41a7adf1bffd2b90540eaffbf159627bea2a4f1153e2e2cb5cb522b9d3aad537f087 SHA512 687005e88b2ba1a8e47c963557077bed7fbacca6fc518806b460a75ac077bd7125b7f8f62013645b6810c56745cb06d052d284b93c115c9afeb69cdedc8660df
 MISC metadata.xml 741 BLAKE2B 04b4958b26b7c8fb99d314cf0a6e09743b9f30ef68e0c05293ac83518b07eb50ee752da9b616579192a2459b5fc856f58bfd66f3b0a7dcc15193b57e83819123 SHA512 74f2fc45820a853a6589a1dc78e93bceecd702c47da3cd6377adca6a62414328630243b6c0496d8efaec399b21678cf2a3805c6e1757cf71f694ac1acb418663
diff --git a/app-office/grisbi/grisbi-2.0.3.ebuild b/app-office/grisbi/grisbi-2.0.3.ebuild
index 5fc8d7898b3c..8dd1a9b71823 100644
--- a/app-office/grisbi/grisbi-2.0.3.ebuild
+++ b/app-office/grisbi/grisbi-2.0.3.ebuild
@@ -12,7 +12,7 @@ IUSE="goffice nls ofx ssl"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.5:2
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index cf5e66b65c00..fb179dd71d17 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,14 +1,24 @@
 DIST amd64-debug-libreoffice-6.4.7.2_p3.tar.xz 1110393216 BLAKE2B 58ad318a09d4759b73c986900e4303c55f62c493dac6a54dde770e96ff4c30a2e2108a648c0d3182c84b096d58ffc10eb240d3b498c3ea5ae4305fa84de1e00d SHA512 7f76bba61fee7f8e5a3d30b7d7ec08a5c1ed25a7f4cb057689310d03b8c15006b742b01839f8d33c1ea8e51065f6fa2f4ec2641c338cedfd942dfc36423cf445
+DIST amd64-debug-libreoffice-7.1.3.2.tar.xz 1430819908 BLAKE2B da0ef021a72d20e84486e649ae90239185b692ed64f402c959550cf311479d9903e84349a474dfb72005c628b68f6905b7364545512fb99248fd8c4f43d1d59d SHA512 fae7dca5b37aaa4f7f40c965edb02c23ac7c21a5b23553191d74fc50c0248bf7a6e273e3e2fa95180fe007d653b596be076773db745a36685ac6db8803d8eacb
 DIST amd64-debug-libreoffice-gnome-6.4.7.2_p3.xd3 1136174 BLAKE2B b4a90dbf3cb53d5c356e4bd7ff69eb75be18bf496e768277e95737da2ebeffc9b2d2cb465aba2c4dc3b4a376e45c857c64b4b240847b24e82e94529572df4ac2 SHA512 e8f58b3dc0b248e1bca704b84545665bd9a59f528f834074e4fbaf63c2e88759dbb0468892504dd056c887cf504ed349cb8032a001df63d5294f8434c73e1ee1
+DIST amd64-debug-libreoffice-gnome-7.1.3.2.xd3 1367611 BLAKE2B 164e9981016143faa3d93489b3a9a0dbe236e46e3f86bf380b562ad824eec05e3e50f495bcd8a6db84d162251676144c5231701758e31480aff8cdb3e418b86b SHA512 f612d68dcd73621fd6efc9e44ae0a4cfbf6e93cb2ced5212c834342b49e0d68b395688dade5a9f13835eaa2e4aaf0e3e4a3925d63f85b8c2941407fbbc731cd0
 DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p3.xd3 505625604 BLAKE2B 62222cce0da41ae7379a44a1bdf2c11fa8972567b62d34a8152337e9dc2ab1c3a354e8f862ee0774cc26c892fea65c538e8c6ab492040145c0264b5ac2e7b82c SHA512 3a5512c2d8bd2553127c1b21cb0da69b53febe6874680927676e55c180cd76f1575eb3fa07d408090dfb831d44dc2739de7bd738f891d8a31b240f152d785494
+DIST amd64-debug-libreoffice-gnome-java-7.1.3.2.xd3 731501740 BLAKE2B aa7a0501b6e29890a121b079e527b09a437559f70e4ab4cd28c98ae22a556aede0ca778a8ec38ed32bc0b80b663b4066fdbef916af0ad01221c3e6e92ac50867 SHA512 295bee2fb3a1693be6f30bdabe22c14d5d6dc3f4cabb678f290344b818310c6150f41ac7288a52816622261e9f222d7406c1679d08b8fea53396323f25539789
 DIST amd64-debug-libreoffice-java-6.4.7.2_p3.xd3 504497844 BLAKE2B b3b51a0dcc5ca3cc67401762ad696d751f03cf9ef33c9d939aab46cf2d26e7a60b60480a3ffe343f1928ef7b5e4b3b16af1cff132af55b59e6ae8ed6cc2a8dce SHA512 7153491a740c53f27430b62dbe5cead8a06c9520c535b913f76eb9fe09b043504c5a0d4d99dde728c13ee6be2656e7ed9298001bb7dcdebcc7871e0716400f57
+DIST amd64-debug-libreoffice-java-7.1.3.2.xd3 730129783 BLAKE2B 3547e67e7cdfe541bb131ca75bd113b00951fe217c991d7054c62e0ad97de44151e55c57569870e448464f73477b05d43481fb6b51f67951aaf7adc6747f8b72 SHA512 c9c57743487ee525c796063c7b4a56f875212617e963a367b0ff257a6b5ebb35fbebf67ff73b4a6642899f2c988081911b7786bf683569c8e2032257dce7a263
 DIST amd64-debug-libreoffice-kde-6.4.7.2_p3.xd3 294352306 BLAKE2B e40cd9d1a2edffef0c9fc7de97eadb8f45eabd8bb3cefe323669945e564624ae508bba4a082ccc10284f09557e848f2eacc03c990b73eb17195f75881a5602e6 SHA512 e241964a062ebdf4ab869f72647496703b1083ced67d74eb6eb4f92d5812716c212c3f4bbdeb2f27542749c0e9340211719c1526a8d19d3820924574f477399b
+DIST amd64-debug-libreoffice-kde-7.1.3.2.xd3 473351754 BLAKE2B c317b5be920bf5a2d822bab77d2a1b1405232f1fb052a599019c5b4a6380756a99044f01493ac1056ffe2d454a180a1371ba2556227fb7d6da5a9e814fbb36cb SHA512 de06c26f7c07a4c459c7f9222cb9d72b019fd2db3d17eeae8732d84cdf95dc827442228d161b653b11de74ae41895cc31bd767156a5f73784f720a039797ecba
 DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p3.xd3 512913914 BLAKE2B e122e62051a328be51dc0b5e5e136b93eb01e1b1102a8ad440e7483d66984b5b69c8180b2867c2990c3560ab2739bbdafc58ee29a44ac2bff66b220dc165c461 SHA512 c643668a70f4d8c85869784de8ab77336e8b993a39bcc03ba43a8c5d06d1f1848af3b398b2d82e46af55f0a5073b3cb7df454c4e231c80ced1601cf32c3975f7
+DIST amd64-debug-libreoffice-kde-java-7.1.3.2.xd3 738307655 BLAKE2B b8f206d1554a7538dcb41c16eedddb0fb62664b9571036582e2e30d057d9dce316d21d16d4f102b60c2d1cda95c6713093bb02492264d8f6948a27aea60a06a8 SHA512 d8f130c9431cb204b9f26396cd113b09ea15f523c919fe9c46e5791f2916de5bdfd7fa3f48608fe0708f7905cd4aa2f3930771b207252c16718a3a1b0894dbe6
 DIST x86-debug-libreoffice-6.4.7.2_p3.tar.xz 1108731764 BLAKE2B 5323edab63fa327a670f2c5427f0f1fa0e743288d55fb89999623e9a140221de757db192449138d3ad2f3ce370f0790fd96dc1497f0d5f0c09317d3cb56498cf SHA512 211203a1691a1efdf4b55c70c08f610bb0a0660ab0ce6decceae9a2c71dca44a4b4010116c0c07de0c2cd9a6543c45d5f8c68612596d65e83ba757886b3ff1ac
+DIST x86-debug-libreoffice-7.1.3.2.tar.xz 1395491568 BLAKE2B cb6e9558e85d04ef489b2026894e104ed2ce16870bea12c9d83b06df0c5b71d4ffba3347a859406a4cbad91a59b2fd1b1ad784487f6f932f72bf3edc60396779 SHA512 6aca88a28df9c68f2bd402bc1c9839b8ad6774cd471fccde8352e5a626a83e15775fceb198538f414f3bfa0b5c22a662bedf7ced0d857b05fc2226e461134788
 DIST x86-debug-libreoffice-gnome-6.4.7.2_p3.xd3 1133870 BLAKE2B ce9bfe5f23700d260f2cb872f3fa57155ccadbcbd96aacbe5e62dd721d6b180a7a3bc7a632fa8dba6405d530d892e4ac8c60b98c66a54bf50418f1687e2fd162 SHA512 598b15be8cc2af87ddd721615e49adbb32b6353ba9af712bf8fe29997420ed3a7b10352898ee2ce76f4b633fa8bfc44bdb1662ba097a28fafd6ab2e9d9e1bdca
+DIST x86-debug-libreoffice-gnome-7.1.3.2.xd3 1314030 BLAKE2B 7597d1a1a3ef8af551e9179beda38ee3f46125c872e6518408039382194a086d8bb16f6fd4c6f69412c0e8e5342726175c4388a910c531dfbdde34ed399117b3 SHA512 e5c7eddfc41f2a72e0036bdc17fb231733d865a0ed759190d0e035b27439e57a910b9b21ec756a82536b0d3b3deed96f38e72b480c7d90824e25c8d373d56921
 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_p3.xd3 504464135 BLAKE2B ab5031fbf713a482e2c1672896fa4393830de9f7cfb9eae7d438245ec4ae5b98605d613af6fb396ffa500738604bb0ddce3e29edb92686058ea7cf9c33324fe9 SHA512 df1e7b9dcb7eeafda450512097bf0c0229183a68e7b179b4c5cee254639d0a7ddb2f1db99e2daa7966fe17a46f7d227df9aede251455236c4efcec7f9503aeb0
 DIST x86-debug-libreoffice-kde-6.4.7.2_p3.xd3 285501269 BLAKE2B be187ba9a98126b9b2f742839eb5ae191eff31cc0918e2ddb0e13ff3a47b1feebe0b45e068ed6a303802146cfae34349ca129fe48fd940276a0735a6b3102ed1 SHA512 8c8c3849873b843ccdd4f813caf0474a1676a32a9328f13f69294159c18fb991914c3cba24d436361f9939de16f54ceab97d3153d7682ec06de215ce629e6a84
+DIST x86-debug-libreoffice-kde-7.1.3.2.xd3 450440021 BLAKE2B fa08b235a8d1d0a05fdbadb0468aba7220072188d4af82ecd5ca71daf62db9197e0a47fb61f168b4d9a9de7e1d3302225e1abad76264ea59e012491e18980057 SHA512 49b167f15bd5b2d50bd9ff53079b71bdf193b91c02cc03d2547395c93d9bbfada7c3a85741ad30bf172d5e5ecc75e8b954354bc5e7f4b0dcb9e86ddf48699e83
 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_p3.ebuild 2593 BLAKE2B 8f7b27ae60e0e21435c08703501f3eaf6deccaa2cefab297b0168bd6ae59cf3a8e26c187b49c19a8a0e7451dfd034a5f79536c1e1638155c6d1eed7e49e9e655 SHA512 37165d409fe1fb1b6b61c55a91b9edce0b11f51cd85f8d0c269c7fe660b37da8bc831ecb67911034312c2fe0be9fe989bc95c69f38372336e895cce6220697ee
+EBUILD libreoffice-bin-debug-7.1.3.2.ebuild 2453 BLAKE2B dd1d41f52e625da4c4b070080a5bdfe727b9e42881298d7cf2cedd9624672fc2de6e1735355e9cfb800654a801a7ec4d6c2b9baeebe7292e554211f21b451f4f SHA512 2aadaf7bdf97e631cde8d43aa02b3160f5cae611ca19110843b7f2d4bb6d8e53c6fde9969fb660810e66c9ca7b785a0ed4d1a0cff81b5a7d6dd7c331c7582a4d
 MISC metadata.xml 481 BLAKE2B 2b7085b47722f20719ca5e219b52e4334c4819db8c61dcee1446ac28e70cd90a3ac7e1713a4e95a0d3952d931ebcc34b137294b1e17f79cea9f41ec31fb3cd55 SHA512 6c5698440da103c49a6a26c99d3af9ef88f79a74542bca66cc8adad77dd5412760630e5753f163e92cbe58b53c0fd899b9115ca3ae85627bbacdc01c6dd7bb63
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.1.3.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.1.3.2.ebuild
new file mode 100644
index 000000000000..080fa5ac1015
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.1.3.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 1f7aacdc120f..f97381b4c286 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,15 +1,25 @@
 AUX 50-libreoffice-bin 158 BLAKE2B 2091698f80fbe097785c60b20f636150a2ee65bf52639fa1bb4a92341d050146040ad8912c5f5e3ca22e48ac3d819053c9948e256fb1d0e0901f7645934bfb89 SHA512 2d1158f48ac80f9212578d020e5659e777ff494adc3abc94438cec6890b88741f92ea2ed3bb4585ffdabe531d55c6938ca9408e9ece5a438e67d480eb406ed50
 DIST amd64-bin-libreoffice-6.4.7.2_p3.tar.xz 132926632 BLAKE2B c5d249988e973049779a99df2e6cdc51325fa27307b1fdacf6fbad6f193ae4e1edb91ddd9b57f716431f872e46229deef4a71d45c0b341c2545c2e8912369e66 SHA512 5a1a96370d5a7e23700c32fed0be9863da0be39df7a247b4a21b2e2f9f9ed92ba3c97c3514c511587247834dfa6957535c88d41d6187afb0a87d30ebd03b2873
+DIST amd64-bin-libreoffice-7.1.3.2.tar.xz 134793996 BLAKE2B 1fcc252038f4a3421456c2f8d3b5899aaf580bade6311a2cee15b117bd66ea9e0d25327af412ab00794ca8fbce6d9c19f722fd8e42f5a758fb77ef9a9197124c SHA512 2c5a4fa09ebadce9f756337f84670b6e0f35075a41ab94bee8d46a8c4fbab208c1eace1ddc0c85c117ee691f10bf89a49f9499f48d9179fd0d7b92fac75e4667
 DIST amd64-bin-libreoffice-gnome-6.4.7.2_p3.xd3 1929541 BLAKE2B 542f8b1b5cca9d64b46e5115266c2e23764d6c7c3617f0385b050fc58e8463172501d49d7294b1e9005a22587b245b754e69b008f66d4fd0b6dc518fcd93c930 SHA512 aa8c649c10122801594b57270c34f7caed7a2014a8dbf9bf9a25b499763c7780f186857382facbafb5b736a665350f2a2154ba4311c88d8ea7171b639edad1db
+DIST amd64-bin-libreoffice-gnome-7.1.3.2.xd3 1454680 BLAKE2B 0cc37af88f92e63611f9b5839abd5df17b691372cfe35647849a46d077fee602a9e666e2bac03e7b9947f366c66fe320f3210a3da20eff6892c8c2423ac90097 SHA512 0c60c2eb83850923943303eb20488d93bbf293c6537383d5c78d929db7293f7ea8646be1e5a4434cdbced7f76cbda848e8f8a0989d1a86d3e50bad77086b70c5
 DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p3.xd3 29599053 BLAKE2B bb8adba8d02edaf7fc4dcb95a4c79e41ec7c5e4645fbd4d901ed48492214ff8c03fd1115e8667726c124ba29f546da92b6605c8944c034ed5ee676deeef468bd SHA512 90d9cfff0358ccd8d1bb3ee21a8597ce7e0897b5961c1f844d8bfbe2e2c220561701a2d631c3918f62b0eca7267c24997dd0ad063455c282d348517ca90de9a5
+DIST amd64-bin-libreoffice-gnome-java-7.1.3.2.xd3 30402804 BLAKE2B 75dc39f40d891da3d75abda9ec9d7d00e8eb167af8df2967689610e7bb2a2744bf2628c9fbe165122b5899f2be3d604c385c904f4832d74c921a87cf97a476a2 SHA512 077948fadfe2e353550f41a42d6e1d8ca683553ec25e787831a082a005449d6f7adba732ec240df1237332561a702bf347e7e81e661b48174b433d65d444d303
 DIST amd64-bin-libreoffice-java-6.4.7.2_p3.xd3 29417968 BLAKE2B 4b5ee3ef8d796485cc9db11de96f973ac958dffa4f91689dc0062db7bd0a0cc35fe5fe7eb19574af2b8251b1aef65da21d0858d213c2fcdfdbf16795b11e2734 SHA512 77ce6945d5b748a2485abd70ebc01c9d3dd42b85d9f5a88660db1c3bdaab95f76aab89cbc6881c3095eadfc8d08fde2b000365e434be6193553a64955e0c87d3
+DIST amd64-bin-libreoffice-java-7.1.3.2.xd3 30266030 BLAKE2B 6386d2afeffadd2b917aa98895f46abb6a357660211f8e479aba3576f49d6c5d587061a2cc382ee8b64d922ccfad06ef14d94fe002494418c0d42d83fdf94305 SHA512 d8578955121e39aefa176a86b25f31f0aca2a7ad3d5463dda44c316be908d974abc1ea965807ae71d1290a1badfbb49d6067e9334e887d72b1e880493b0c81d2
 DIST amd64-bin-libreoffice-kde-6.4.7.2_p3.xd3 19726501 BLAKE2B 52f1335998b47b9e586e408699d8dbfc7371e27967860c11d4141e8ef68ed13db32977999c739a3223f9b52a8491a3b3e532e232674ee499fb9f2fae4226ed93 SHA512 cfb1d9c1046eac6239322a3abce394e02ff1619710c87e2ccf6b8e2e5be3f1c943e165344a9134cad9876423a37e9148ab3b15217a41c7f0680867b7f0ad55d3
+DIST amd64-bin-libreoffice-kde-7.1.3.2.xd3 21322010 BLAKE2B 9b9a90372114850470bad680b50af6d0c0e33f9d3918d8ce7b843bb54d839815b604797295b3fbcb04e7c7ca11c1c5713fa2ff9b83ab545b0a874badd2a32177 SHA512 d14c83d60ecc68e593f8526d09b0854d4a48524d5b81b1b548c5bd2d499be23ac3709ac1ba1b52f8967e1f095d3a479cd615d5137a64407ad90e928986d7e272
 DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p3.xd3 30202629 BLAKE2B 95ec8df939a656537b86d7d3054cc28213f11b276c5b74b20b6b63773c6ce0be59aee9d3370ce4c66219d55f48521ac1ca11622a1ec8082b59069645e94cfd80 SHA512 929885d21ea8d1e61e3353e2b26554711f61111667d20fc34067fc5e7e11a2137539ce0853e9ffceda9498d556ef1e2c04e7518b6083b86d824f6980e0ce4701
+DIST amd64-bin-libreoffice-kde-java-7.1.3.2.xd3 30613052 BLAKE2B 1bc769aff8965af40c3aeeef8390d44a9c57f920ae02e0ca4c9667071553c900c85268b4113493d6f3004edb9332b1719676077a30f4fa36575b483ccb1ecd79 SHA512 767b1d2c8be628fdb759440e5007c02d3110e288567cd67ffa18cb16da67cfefb8c2ada10c617f95900acccea41783fe6aa6834bbbc242d26a4929cedd09c4d9
 DIST x86-bin-libreoffice-6.4.7.2_p3.tar.xz 134564388 BLAKE2B 8de9bcb052136d1280795831a0a273f3f91f644f721263f4fd6b1378ebb407d8a5098e11220809f31626a0c8b87c00471053eb2b592cb2fb466753ad9bf50c3a SHA512 b80eea595111f80e8c3742d5c2f299514fe5ac7a32ccc0e51f22d78fcc6652bc26bb2cd65e52e377cb15ebcc9ca63f881a5835cf3445d6a73e691f833606e7b1
+DIST x86-bin-libreoffice-7.1.3.2.tar.xz 136535384 BLAKE2B b8a567cdadb36b6807a848f72549e781a6e44779464bbafbe1c228e4f1a17accb705336719b647990faea6df50a6949427babfaadeec6a3859b1d0776a6082f9 SHA512 d2b39f84bce4842c1edcc7e3c6a5a6dae0b9517bf73de5b62dcd475a93def8236d29633552fee088742de3458d284aaa782158862610f174740eb5b3b06238e0
 DIST x86-bin-libreoffice-gnome-6.4.7.2_p3.xd3 1909501 BLAKE2B fc56ea80fc2136049f37e9e5d23707d3c67fb0c5b5f07da4081deeec601714d06d3d28e6daa5f7dfe4e67d3142327f25bf1f4f54211a37846c7c8ca94acc81e0 SHA512 3e8a4fd3ac127c1ae6b9a78ed78a4dd767d08ef0fba4bdb1ceb183a101d9b9a46dd5c2dcd931033bcd732163053bfd1a0cf26742d3ef3f8f22d5af45922c1524
+DIST x86-bin-libreoffice-gnome-7.1.3.2.xd3 1463008 BLAKE2B e8e40a4bdb9163722bd2eba295fb529d2ebcc025e9721ca9e30a5db0f4c5bef9f3e08b6efcc7b7e14b8cc6f59743ae412b1ec34ef5c1431cf0c61b5e87676cd4 SHA512 061b7a3d72e20d1f928dc8cc36f8d30f8830febe23cbfd66f4f973c7402fd05fa7b129e75ddbf9ed4073ff98162f90fc7e543672634e0b9efa05e9325fd9f4ff
 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_p3.xd3 26982704 BLAKE2B 0f0a69f86c9751af74205c54f74ab32f7c552426f47be9d7f94067a01a4db7d5c9ab8d226cc563c897ef5694ad823708f713050d01cd34c7c1bb0b9b112ebe75 SHA512 6650495d959e0de6ff9e7f13e1e09b11d2d449c0f78bd8580edc1465d76b0d037d5033f9b74358f20272c224c15568affc4fb190974e2f7046d0fbf9c3d0c044
 DIST x86-bin-libreoffice-kde-6.4.7.2_p3.xd3 17740958 BLAKE2B b8dc1ba6da19d96b4e0dc6b9c4889a3e50f81575638f952abd2773b44995a68bdcbbe8274c0886ce249ee11a4de73225be8b4e93d014decb8dae396bfe40be07 SHA512 9154c2918e7d725fba7fc43f03d0c4ed157181ebf09f7e08e1b63797a192f75d24ef854483dc5a1a5c110f90688b4edc7bb532f60af4fdf3f5e42b71c66531f3
+DIST x86-bin-libreoffice-kde-7.1.3.2.xd3 19177685 BLAKE2B 9598c49e65321a4faac6da16ae28127ddcd25bb5d056a1c0ee67b7442fbb25ab8df729ae3de7c7e1277c1364e07cdfb46b123651d03ea261621885915e944e47 SHA512 be53f662163b8eea5fc47d46942c48dea848c04f42278f90b3dfaf28ad4516e9c61ce0ea052bc845871bafb7a6a99d323e5ac3cbc60091d5e251c041653e339d
 DIST x86-bin-libreoffice-kde-java-6.4.7.2_p3.xd3 26966369 BLAKE2B 08102ca92e948c920977c0f909657eccbc148906f527da4dcbc5af93d7577862e652e9725fbdba4463adf26a5530328d959dc8a729e94ca1d0a43197e48937dd SHA512 32f5927e621ac23c015449ac485ac452ff5cd07f18e3c76d61b3200580a123111b5a57d3a2d7db32719f91d5d5da6249ec27328d3347df98a4548e60b957180f
 EBUILD libreoffice-bin-6.4.7.2_p3.ebuild 6153 BLAKE2B eaa8c8c36f2a56fb3b6dd832e4795de2a528eda493b73d91881ae9fe13903c6e62fe3adea21ba4760fb9d1be48c02d689d2c99e0b99872e4d223dd12c3b8513f SHA512 9a983d2c0c9c84879713d9b9ee2c320da9105b9f4f6dd4ef7dbd7820456fbd0af3922c62acf8d2f96caf58d84e84a2fce2b31f4bfd95ea3f5d3a91387c3a2e48
+EBUILD libreoffice-bin-7.1.3.2.ebuild 6129 BLAKE2B 169f9c03b3fea9416d28825cfaae61b77e179152e5b03cd4ffdf197032e677e0852504ef47abffe84e6a46c5e835356bad4050bfc9658349d6694a62a315c497 SHA512 2998780f504e686d210b3fcc17d7e44f0d73b6cec4dd66bc265c40d229f709efafcdee9123c2a3c1c3a8eaa1bf5b8560471e42b692dae0571064d8be9350a56e
 MISC metadata.xml 510 BLAKE2B 3c08e88fbf4a981a3adde50ee62d59899f24f87b2aee7359bec6c337adde486096de536227d81b1e3eeb2a27e01c08ca1d91db6d9311e0d34211528f63aea23c SHA512 12331dfd1fe409ce5a65bcf1ce8bd2e23f2e789b7009216e987b861fde897b78b16487399338af0e94e9e40da70ba32624251d71de5aae7d5b23891f54a994f0
diff --git a/app-office/libreoffice-bin/libreoffice-bin-7.1.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-7.1.3.2.ebuild
new file mode 100644
index 000000000000..f5b978df0aa7
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-7.1.3.2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_9 )
+PYTHON_REQ_USE="xml"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.7
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.76.0
+	dev-libs/icu:0/69.1
+	dev-libs/liborcus:0/0.16
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/0.9.18[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-10.2.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-1.0.6
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	>=games-engines/box2d-2.4.1:0
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	dev-libs/liborcus:0/0.16
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	>=net-libs/neon-0.31.1:=
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus[X]
+	gnome? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	!kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl]
+		x11-libs/gtk+:3[X]
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( || (
+		dev-java/openjdk:11
+		dev-java/openjdk-jre-bin:11
+		>=virtual/jre-1.8
+	) )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 89f05018ba9f..352f80203898 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -2,12 +2,7 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27
 AUX scribus-1.5.5-findhyphen-1.patch 1118 BLAKE2B c542a292601b43f12ee2b682225064bd650f2017466aed4aa3a256610dfe1aaa662857cf60682b3c8f1a0dd1b22b34b8c058967bc4879412e8599a641e254b18 SHA512 d536cce91eb161e2d8ead619f932111bcfe661bae9e0706567a0a789ef80eef28e6f81c357bd7bdaaeb97f8c6a872deb7147fea7fef84e279b7e8e812a821cef
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
-AUX scribus-1.5.6.1-poppler-21.03.0-1.patch 3383 BLAKE2B e72297007c3c27b5089340f6704ab685bf3b21eed7e0324dff3ba66c57eaa707847873417fa1b136b1b981bca44819ebada61d954309035af194cd523390942e SHA512 15c0e6f207ae700ab6cb899ee517bad323347f856c6fbbca6cbd4b1393ecb8ce884acb8ebe47575b398f299ee49f2e63b61be6a705e584683eeb9760be8e7368
-AUX scribus-1.5.6.1-poppler-21.03.0-2.patch 1137 BLAKE2B 59594ede7b957602a66a7d42afa137031553422f7dd6bb4a7711a5a7655e126ed2cb435e0425fe28a6efe24544df77c6ed66eacdc6419021c58c7c2011002928 SHA512 f51009e841761c014bad115e1c3b7b3496bd8a2d2cc85b69b819130629996992ec9c80a97c59d18d5f7c3ba88f978b457e893f29bed60e2763ed42963a27870e
-AUX scribus-1.5.6.1-poppler-21.04.0.patch 1079 BLAKE2B a8f4a785ad33ca7ad1760abcd18e2925dc2253a906cade963e830a0f39ca19678f2edaf3111aa8985ba8bb30cc3da4eef4cdb95bf23a28bb2082379d894d7faa SHA512 afd2379cd9666c4f77241198fcea565f1b568cce928e629482c16f817465ac832b1143a359fea53ad38f25064710501a6bb316f35172074910f2c5747cce87a6
-DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
 DIST scribus-1.5.7.tar.xz 74490040 BLAKE2B 80ecc25f506ad3bdd3b03362b6616f1f7394b7f2794349cdf60089a7e5d39e861883a7e1b3a949667b2eb41b0b383bd8536de8a0feff4980305ef52f85eb0d05 SHA512 0c8cd42b9d3d26e24d4e0f6638b6c72bab2c2c3aa7e7195efb222391a0c0e671633e32afb08ec35b6ab5123793983de5d413aa7607b51adac3725dc8a83bfb01
-EBUILD scribus-1.5.6.1.ebuild 4134 BLAKE2B 56606a24ce138d0b3774aebb6a0b9fea34665cb0c93af152b45995c3eb2aa0319c0cf71ae69e97b0ef47ccb0fa1aee89b1a578257b06732f6507da1e5443e7ec SHA512 a9f87b09c805b2c6438a0c7115f0e752976c6f1227f08a4c4674fb53f0a06afd172d4648c39d20e9b539790b4cf0825292760454c1e16582e9415509f4d421e6
-EBUILD scribus-1.5.7.ebuild 3993 BLAKE2B 7e9c5270091c3af45d7d47512653b5aaa1284dbc57d492c5ae144340ba4a52511e4de75f88cda0bf64c6fe8c5ed44edf0b2386b0f175e5293ddc8207ad4cfbdd SHA512 6813630a3a949ab75c95e821817a7ea85d433a948cbcaee5ca707345fc58b55b94fe5f4817a97f7eb7fa82eedef97485ee697a854e1b995748b9170e380fab5b
+EBUILD scribus-1.5.7.ebuild 3989 BLAKE2B 4e038adf5f2fe3797e5d06db2a5ebcbc5fab1abc4290c8c500fec11759e4bb90cb7dce35f84a14085cef1caf5fa49b35a2a7f85f6365c899822f9c17c44d6488 SHA512 80890b92964d5f32eece3621c6c7f45308833753bbb2f8218f9f0e8ad3cfc1e0eabfdd28204b8ab5cc1a40c52ceda68568ed30db6aa43c1698bd0e5aee545a5a
 EBUILD scribus-9999.ebuild 3952 BLAKE2B 324e637c48bfa8d2d4c1b4f065e21263300df57ea11189f294b0121a1d1925678fcff30b36f5f75d23a2be455ee43a3f8845a326cef99c77cd5527bf54829146 SHA512 38c4ec22cbc9df9c3664bae7ff0e6131003b29da21e13956d04b7a3493e7ae0e7d3f05c025b303d9d51ce6f5a00fb5ad31be0808212413974e131937036933ec
 MISC metadata.xml 882 BLAKE2B 87f52990c93874472eeb73cbf7b46b4c1fa41d25e17d179f5cb9f5067d21aea18ac4ac323e5878c2bf49d075f67230353860cd6b45b9458435ca7b0fae9854b0 SHA512 403eb2874bccc2929284f1e44042e1fa84c2ad9d6abcb1b9600f327060e1b476366ab40cf6f8876aa18bf8195c21f82e2deaecfa7e1868b2fcfeba42c72e9d58
diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
deleted file mode 100644
index 18c1edcaaa99..000000000000
--- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Mon, 1 Mar 2021 21:52:54 +0000
-Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler
- 21.03.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 12 +++++++++++-
- scribus/plugins/import/pdf/slaoutput.h   |  4 ++++
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 7cbc73e8d4..d1b37a0c21 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh
- 	return gTrue;

- }

- 

--GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)

-+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep)

-+#else

-+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)

-+#endif

- {

- //	qDebug() << "SlaOutputDev::tilingPatternFill";

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)

-+	const double *bbox = tPat->getBBox();

-+	const double *pmat = tPat->getMatrix();

-+	Dict *resDict = tPat->getResDict();

-+#endif

-+

- 	PDFRectangle box;

- 	Gfx *gfx;

- 	QString id;

-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 5149f19e31..66c34203ae 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -197,7 +197,11 @@ class SlaOutputDev : public OutputDev
- 	void stroke(GfxState *state) override;

- 	void fill(GfxState *state) override;

- 	void eoFill(GfxState *state) override;

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)

-+	bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override;

-+#else

- 	GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override;

-+#endif

- 	GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill";  return gFalse; }

- 	GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;

- 	GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading)  override { return (shading->getExtend0() == shading->getExtend1()); }

diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch
deleted file mode 100644
index bff1c08b39ad..000000000000
--- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.03.0-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Mon, 1 Mar 2021 22:00:02 +0000
-Subject: [PATCH] Attempt to fix build of pdf import plugin with poppler
- 21.03.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24538 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index d1b37a0c21..de0a4145ef 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -2336,7 +2336,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *c
- 	// Unset the clip path as it is unrelated to the pattern's coordinate space.

- 	QPainterPath savedClip = m_currentClipPath;

- 	m_currentClipPath = QPainterPath();

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)

-+	gfx->display(tPat->getContentStream());

-+#else

- 	gfx->display(str);

-+#endif

- 	m_currentClipPath = savedClip;

- 	inPattern--;

- 	gElements = m_groupStack.pop();

diff --git a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch b/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch
deleted file mode 100644
index bb821ea5c9a5..000000000000
--- a/app-office/scribus/files/scribus-1.5.6.1-poppler-21.04.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c62844064cd6d85802d21e188b0f479463e22095 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali@libertysurf.fr>
-Date: Sun, 4 Apr 2021 21:37:04 +0000
-Subject: [PATCH] #16536: Page::getFormWidgets() returns unique_ptr in poppler
- 21.04.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24599 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 66c34203ae..cb191b1023 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -379,7 +379,11 @@ class SlaOutputDev : public OutputDev
- 	Catalog *catalog {nullptr};

- 	SplashFontEngine *m_fontEngine {nullptr};

- 	SplashFont *m_font {nullptr};

-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0)

-+	std::unique_ptr<FormPageWidgets> m_formWidgets;

-+#else

- 	FormPageWidgets *m_formWidgets {nullptr};

-+#endif

- 	QHash<QString, QList<int> > m_radioMap;

- 	QHash<int, PageItem*> m_radioButtons;

- 	int m_actPage;

diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
deleted file mode 100644
index 5e803e2024d1..000000000000
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="tk?"
-COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a
-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://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-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
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-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_MULTI_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-poppler-21.03.0-{1,2}.patch
-	"${FILESDIR}"/${P}-poppler-21.04.0.patch
-	# non(?)-upstreamable
-	"${FILESDIR}"/${PN}-1.5.3-fpic.patch
-	"${FILESDIR}"/${PN}-1.5.6-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.5-findhyphen-1.patch
-	"${FILESDIR}"/${PN}-1.5.6-findhyphen.patch
-)
-
-CMAKE_BUILD_TYPE="Release"
-
-S="${WORKDIR}"/${PN}-${COMMIT}
-
-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
-		-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/scribus/scribus-1.5.7.ebuild b/app-office/scribus/scribus-1.5.7.ebuild
index 0793c811fb99..eebeed0651f5 100644
--- a/app-office/scribus/scribus-1.5.7.ebuild
+++ b/app-office/scribus/scribus-1.5.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://pilotfiber.dl.sourceforge.net/project/${PN}/${PN}-devel/${PV}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}