gentoo resync : 25.09.2021

25 files changed, 151 insertions, 87 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f379fd9ce5ce..0a78183409ba 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 5495268cc963..26d16d5f1869 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -2,6 +2,6 @@ AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3a
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
 DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
-EBUILD aiksaurus-1.2.1-r2.ebuild 1040 BLAKE2B c9e0aafd7def0606780ea4c6871680fd86559a9e374734de4164981e9d00eb61e6d63039ef16ffa0c1a08bebfd952610e9f9df6062427dcb8435178323b6b3a1 SHA512 807a439e6b87ce940ed325b524bce9ed3eac0ecfbaff259a86d364d3f18d7bd75bde68af963051df585e89e383914115a711e1d57fcd1e5a7fb21ac709fc5baa
+EBUILD aiksaurus-1.2.1-r2.ebuild 1035 BLAKE2B 1cce411ad0f515efb358349dac8c64aa541d58233036db8b648bac0edfe67107ea6543e5796d379f11088dc7d566b1267e1f5fb51cb122545e81b4852ade3e4c SHA512 170c683b849a8e448752616440d404d8cbe90d0ba4f11af8675eadad91fc702bbfc1900819ebc2601d17732b4d38d89dcf13169a7f7bf1cc194c68e171e13366
 EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B bb46c201ab41502c8a3b24a2ac2d97f62244131a95efb3a9d8968f397dac06b3d86ef0b43dc5d56499c5770d95e786fb64dbf1427cd08dc026e9bb740a7381ab SHA512 fd0ff4456cd07621f294830397f7221cfc0026e2062dcde149d1595cb2922b5858a0b38317ac6ecc4ba78488798d0d9273e26561d9f36980bd3d1d503fe04867
 MISC metadata.xml 246 BLAKE2B 6ffed2d4f482be2312cbf43d4831e4578c01c855c2134af7d046be942d566069c910bf5fff0133366f2808a7680f50995f2fe9576b561346c54003b59b02ff10 SHA512 6c290491874e5711080025e89aedb0d9072009324b6757bda046f220eda86ad332814745c9653dbe1b14ee4fa8c625f4a4f66201ca49aac95ad7f681df481153
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
index 0062ee0b9a9e..396c7f414015 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index ced4056f8dc9..ac2c47f21ca8 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,6 +1,7 @@
 AUX ghostscript-gpl-9.53.3-fix-ps2epsi.patch 537 BLAKE2B fe6bf851c52751e3653e8e7cfac4b5e5e85ec3b9c9a125e5c7e0ca3aeca5cbe0b1ffe068633dd091755bfba410476b1328abbd94af7c90637541215f484e2413 SHA512 901a8a3b2ef645cd1e61f7596aa0f71921d480ebd48249b3d4e0e07dcfc33bb92ba484a28e952575c33062b3f429d8d60b43aeba8ea59a0623b18405dc27515a
 AUX ghostscript-gpl-9.53.3-freetype-2.10.3.patch 508 BLAKE2B 8819f3be84b556adde4808509a1199d08b059a77abeafb6d95076194093a3223cc8c8b7032124eaeaa98dedb237dd94632cb374cb854f7d1594a80b82df79173 SHA512 43bb10cbf6b316d59a616f986fe8bea87af1313ca71138ecdeb531ea2a689c64718c44d0a81f69bdf30e3814fec3b36866c2249d26c6d45c58bd121accc7f8d4
 AUX ghostscript-gpl-9.54.0-CVE-2021-3781.patch 7824 BLAKE2B 3e02e0085175054bb11dd392489ccd52cfe2d9b8b63430db55f54f95e13c1965f685eed2ccea367335565a0cfe2b35884a6da6d7465eeaf32442ec7680839917 SHA512 d00fccab57efbf2256d1c87f18e915a4c4dfc9a2c2a7bbaf9206c0a1fa72479402ded34b6b669ab2979cc637ac18181cbc3fe81ad18c2a3a4e5611f7d34da554
+AUX ghostscript-gpl-9.54.0-makefile-deps.patch 4532 BLAKE2B 555602c6f2fa1ea04e90ee4c68cca1965f8d31e6e9931c676dbe34e772931cf531042707e7f735081e8a5c5f0452ce9bb098add7dce661c8191ed29fa7a4db8f SHA512 96dd46ddaa9253886dc01dc093ea404d1c74ca9ca355b5dad0f2ef452c50927c114c4d27c961b688813eee713ec6565ab4ea1d1fb3ff47aca9c0194a04e2c6d9
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
 DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
 DIST ghostscript-9.54.0.tar.xz 56001768 BLAKE2B 4a98b1af74c4b4caf8d263cd5529059304a76884418c90401b0fc9a89e0f5de5417a439f6e08b95374e62158eec65528ef5f949497d5050a6408fb7c87e54aa9 SHA512 a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
@@ -9,6 +10,6 @@ DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c08431883
 DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5176 BLAKE2B db5d5ca4785c48ca75d55c980f9e1aae1132f3e68dd52e2443fe8bf0202b7c82367893167a8cc8a700c7ef12ff9d8743eb41732b8ba450b9fd9606a274210a36 SHA512 44a43ed682065164dafcfe7eb62918fb9906197569be216bfcc800d232d2ffc33702090844ad8b10f65492c60cb90a5b162560ad26b828973ca46ea85f993a8c
 EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
-EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5180 BLAKE2B 761fee44bfa6108187c3ff7c533ea9d7e08adedecd947924a0d01737c4603d5fd9c7504b5450db576b23b3c4ba315fea03ca9ba0148f2bdfd6638d86f05206f7 SHA512 a08aa7301628c345a95c684bc21ed54ffb5caf191997b4ff6977f9c23e324a9b58c62cbd75083ce7d8748f7a867b3c734db93ff091929aad5eb6e5ac3e8cd030
+EBUILD ghostscript-gpl-9.54.0-r1.ebuild 5312 BLAKE2B 4f9d51fb65e131057d763290d2fa17cb6705c2a53d5c4181c73527cd130666fae9f0af24c0578c5cb217e812a82da6b2a0b9036a4ffd37ce38e22d3c7d5d2910 SHA512 38829cd1457cc2bb6eca7e38c2b0e42477520c5c93abf0d3563117a2bd34d7ac2859045672cb65f14a40b64d02b2b46923c8c1821e204291feb46884a9700278
 EBUILD ghostscript-gpl-9.54.0.ebuild 5143 BLAKE2B d9f1444bc320b4c7747722ffafdf5b8d47edc9ec60abc682d0ce91c53d8ff3e047b51a06af5d3acf2d09603b775bce0a199c9647f3ba2a61b3a249891327b29e SHA512 a6a5623daad8e504a8afe6e18a1fc9783ce9eb6dc2b8504eaa161d4d51dfedda2a45c85802eb72519ddb47fa2278c104946fc66dd9feafd763fc999d54e90be6
 MISC metadata.xml 765 BLAKE2B dc8466ca08f1fa1891cc60e886bfdd4cccc517c4b355ba6d7697acdece16657982adbfbd4f5709b3850dfba1293ce269b17f9c05bb92f5e5531f3c7debd13613 SHA512 7f4dba7c256642b532cb7418507169a2554e0c4058011ff8dba802f93d677a824b8ae7896840369f06c801ca4a7d27fda86f8c6a344127f65f61ca6e3a02c0ee
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
new file mode 100644
index 000000000000..33858f763db0
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
@@ -0,0 +1,110 @@
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=4874418fd031617212336b8b55f8fcba3b9cfb68#patch1
+https://bugs.gentoo.org/800125
+
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Thu, 6 May 2021 12:23:59 +0100
+Subject: [PATCH] Remove makefile reference to non-existent header file
+
+Fixes (spurious) parallel make failure on the cluster
+--- a/base/lib.mak
++++ b/base/lib.mak
+@@ -488,7 +488,6 @@ gxcoord_h=$(GLSRC)gxcoord.h
+ gxcpath_h=$(GLSRC)gxcpath.h
+ gxdda_h=$(GLSRC)gxdda.h
+ gxdevbuf_h=$(GLSRC)gxdevbuf.h
+-gxdevrop_h=$(GLSRC)gxdevrop.h
+ gxdevmem_h=$(GLSRC)gxdevmem.h
+ gxdhtres_h=$(GLSRC)gxdhtres.h
+ gxfont0_h=$(GLSRC)gxfont0.h
+@@ -2407,13 +2406,13 @@ $(GLD)roplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(roplib_) $(LIB_MAK) $(MAKEDIRS)
+ 
+ $(GLOBJ)gdevdrop_1.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \
+  $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \
+- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \
++ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \
+  $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS)
+ 	$(GLCC) $(D_)WITH_CAL$(_D) $(I_)$(CALSRCDIR)$(_I) $(GLO_)gdevdrop_1.$(OBJ) $(C_) $(GLSRC)gdevdrop.c
+ 
+ $(GLOBJ)gdevdrop_0.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \
+  $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \
+- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \
++ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \
+  $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS)
+ 	$(GLCC) $(GLO_)gdevdrop_0.$(OBJ) $(C_) $(GLSRC)gdevdrop.c
+ 
+@@ -5585,75 +5584,6 @@ $(GLSRC)gxdevbuf.h:$(GLSRC)std.h
+ $(GLSRC)gxdevbuf.h:$(GLSRC)stdpre.h
+ $(GLSRC)gxdevbuf.h:$(GLGEN)arch.h
+ $(GLSRC)gxdevbuf.h:$(GLSRC)gs_dll_call.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxdevcli.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxtext.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstext.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsnamecl.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstparam.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsfunc.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcspace.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxrplane.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscsel.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfcache.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsfont.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsimage.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdcolor.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcvalue.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxbcache.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsropt.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxdda.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxpath.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfrac.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxtmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxftype.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscms.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsrect.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gslparam.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdevice.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscpm.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscspace.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsgstate.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsxfont.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdsrc.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsiparam.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfixed.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscompt.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsmatrix.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gspenum.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxhttile.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsparam.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsrefct.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gp.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)memento.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)memory_.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsuid.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsstruct.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxsync.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxbitmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)srdline.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)scommon.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsbitmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsccolor.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxarith.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)stat_.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gpsync.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsstype.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsmemory.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gpgetenv.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscdefs.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gslibctx.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcindex.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdio_.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsccode.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdint_.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gssprintf.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstypes.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)std.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdpre.h
+-$(GLSRC)gxdevrop.h:$(GLGEN)arch.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gs_dll_call.h
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxdevcli.h
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxcmap.h
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxtext.h
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
index 26de70cf7a7c..fd72246a2b01 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk +jpeg2k l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
@@ -69,7 +69,9 @@ src_prepare() {
 		eapply "${WORKDIR}/patches/"*.patch
 	fi
 
+	# Upstream patches
 	eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch
+	eapply "${FILESDIR}"/${P}-makefile-deps.patch
 
 	default
 
@@ -162,10 +164,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake so all
+	# Forcing j1 for both emake calls for now
+	# See bug #800125
+	emake -j1 so all
 
 	cd ijs || die
-	emake
+	emake -j1
 }
 
 src_install() {
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index c22e0ca93496..056a59faca59 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.5.2-r2.ebuild 797 BLAKE2B 24ce3ffd49c9345553e92435d69ffe4056c2f215754dd61965ad608cf04237b472e6b6065b45fa38c3b8c45ee22c91021b92f4cae1d4608f61b834cf22dc7812 SHA512 dbf618f1964463a1fedeb9229a489c45d07d713e69d58d19a97b21c87e6696161aba5abb6ebfa40f752363af6a88cbe46a611d7139da9fe32a13309cedce8544
+EBUILD grip-4.5.2-r2.ebuild 764 BLAKE2B a6052b65931aa1ba8fa8d1943a6621dcf749aef2e26830026347d69936615809dd163c073dde46389cd81269ac45a68cb9871ce6e2bd62c5fdaaf1395c2f7f18 SHA512 2330d10a8f6186414dc77bf85a19e4069aac540fb2de217cda68f06fad313b740b0f5547238dd801b6ae748de9bb4dae82e0a1ed15da2e61cabf13c365a738ce
 MISC metadata.xml 365 BLAKE2B e01f58764eda42b4e6d7ece18b3f2996fe55e640d91cdba317f1f9677a59b114d7caab6c2ea7556f1962e30b8e2b453814179d7e978b52c4c07fe6e89d9a4978 SHA512 286ffe7168abf8d980ad5e713a31751241901246c6b2fe8372942e50bef53a70b3ff17045e99cb951c968309fcab5c9776a1fb26222c0ea4edfa467e8209eb4b
diff --git a/app-text/grip/grip-4.5.2-r2.ebuild b/app-text/grip/grip-4.5.2-r2.ebuild
index bcc8bb3ea4c8..77bd4c342234 100644
--- a/app-text/grip/grip-4.5.2-r2.ebuild
+++ b/app-text/grip/grip-4.5.2-r2.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 14d778fc95a7..243f0bed6f69 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,3 +1,3 @@
 DIST htmlmin-0.1.12.gh.tar.gz 134130 BLAKE2B 5a9996bfea469f273c37bd0bd72c0e27b8636cb4552681de1b7e9a4849ab215815f7fc8ce430392b8ca3a849b3e51d8188ca248a8ce23242905799258ceeae29 SHA512 6d9db4b6bcdd6d223be8b4e3830da4d63ac6d7d28ee83abd97809b0b901968c994c8434c992fbdd148101ba25d8d786c93657cb5f82881af44dadbba40bf3252
-EBUILD htmlmin-0.1.12.ebuild 655 BLAKE2B 692cb8f94b95d5a852acbc75b73a9a3d5bf23b7a6dc787deb4bf9620ee68015a9e9b2c248141e40ed46021043066fdb4e5745cf588a9be2670098412ac018b08 SHA512 efd7a16fe7d9d062464042e08c2e9dc717ee711172b05fb4f8b23bdee8f5970c58aefc524f4e1f9b09ec818e055a242724873f88f53c3b30dd5d208557c08e3a
+EBUILD htmlmin-0.1.12.ebuild 662 BLAKE2B 070d2784ba9c9ceb54247eb52d26ad5e23f37434dbf74e1fa33b97199de6bf3523b46190f170172b4b1367e1dc3b63204623f8b0a9ff2a5297b9e879e3a58f04 SHA512 1e976ee7e37c5f9f2607e9ec61e4b53e721020753dc8b0aed2594c146b9086401af4feeee7277b2d0f6cf7fe2e687e5530d6d97884517c15ed40c5c7e43ea096
 MISC metadata.xml 503 BLAKE2B 120b7dfe5ecbbdf5b28ac559893d991071c39a34644aa6556abbf8c58c91f908003240f647ccbf58d6e1e776130e72a95bae033a07272ad213673960217acd9e SHA512 dbd48a6b9caca3a7c2e4789653c133321a6e42da5cde9b552c527d5afde0e0c7c0ee25a4712822a4bc1768424c0e3d7216f6d56a24899f2f0aed0b6a20bee61e
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index 75f74c7c325e..6cdeeaa6b4cf 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${PN}-${EGIT_COMMIT}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 
 distutils_enable_tests setup.py
 
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 4b354153b3c1..375b633159f6 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -6,5 +6,5 @@ DIST htmltidy-5.8.0.tar.gz 1015303 BLAKE2B e8e48cfdcfffb7c7ac494f71ba709361e21fc
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
 EBUILD htmltidy-0.99.0.ebuild 1970 BLAKE2B 3070aed3a7fd97500449b0a9d15e94310d0fc6e1132031eb780c219341906c9c28d18c17510768a39f7c0abeada96ba536281d4e363cd9a5dee333cf05d80ef5 SHA512 c2daf06a319549320e4510df60f240e9f6a9504657fc230ca3d6af535804b1daf47fae2c6f92bab84fdc31b3968683e30228196249b60e92d480540006c89c2d
-EBUILD htmltidy-5.8.0-r1.ebuild 1494 BLAKE2B de2b8586b9c894b89e8d9ab3b9faf2b3f8f784dbaf99b4a7243fa335dfc4433fab1346f2cf45d8ee3379e29d657ead73a09c00b2d63735c67fecdeb998311b8d SHA512 c7251f63d0b9f8992056e4094e55088328bdcce6983f708f8abccdd35c83c0027a2a3761e9aaccfa34f74f8c264ad47b469897019292e222f9fac1065a60f1ec
+EBUILD htmltidy-5.8.0-r1.ebuild 1499 BLAKE2B c5a6e7966ee73207ca385294bc0434fda47e06efa43b0d407f3e77ff0eb18cd4c6dc9de98cbb07507b6fb0b03f4a29074cd4740c8772b7f87f142a130f2273f2 SHA512 d09fdddf4fdba258ae4ea9a27bd3d4a6288e68c921b36a159a5bf4750caa5846d3459a651ed919c85ae678eafaae619079dbe449bdde1336deab952161932d55
 MISC metadata.xml 608 BLAKE2B 7fcc3eaa3f24191606776cc3a92f97d58f1ba27c3ebeea50727bc334d504ef09ff4387208222080574856db1e6d1d8689a9b22f1ef0f0347f3bb82d9a38a6afc SHA512 adc1857b273dc8bb8fd7215cd733e56dd41eb7e9eaf82ccf183f001afeeaafd2ba4cde4f9b75c2882427ebed7cfcb60a16408d19f9f6c6ad91b6beacc9edefeb
diff --git a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
index 5dcdaf488f75..0989f564ad9a 100644
--- a/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
+++ b/app-text/htmltidy/htmltidy-5.8.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/htacg/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0/58" # subslot is SOVERSION
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="deprecated test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index b3e24104e2cd..27fd2350b4ad 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,6 +2,6 @@ AUX hyperestraier-configure.patch 12359 BLAKE2B 52fb2210ee4945c07fcd4e9812be052a
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13-r1.ebuild 3598 BLAKE2B e5c4c2e9522307c6d588cb2bbede98a8900aaf3896b60dc6e3acf585c035592a50e11f6957a30e2e5e7171fa65e412bc9cd29e59498dfa96bd898e376ab3bb5b SHA512 6ea827694e2a91acbce6f790b5c0d93cce44de7b97930c00118764d14b795821cb2a5bfec28abae91ec2286118b3c1cc88b44cb11dc1352766910c6960f1e23f
+EBUILD hyperestraier-1.4.13-r1.ebuild 3597 BLAKE2B 575af47ddd4732ecd3cbdb5e8f16d4cf9287de0fe3e58a8511dfc67745b570c4aea850f1d084c0f079a2312f104b5e241c60097a0403e2031217c67a540ae32a SHA512 383d5223c9d0b1bc59450a148cd3bd58640b0f2ea984ba0053a124589baa49ff34eb91b680ffabe490dd7f692405acfc74384527f7b4597a6c58f4bd84801ac5
 EBUILD hyperestraier-1.4.13.ebuild 3597 BLAKE2B 3df6c264d5e5eb5fcab4fbb6a694bed6db512e96dda7f4780b9ba593be85ef50ae6ce8c46432d38a3abebd27a10ebb2583d2af5b386c4528ba53900eddf37112 SHA512 332c3ea1708f5138d3a594c04727167a7b90b8a8681ceebe7d35d9155b1e2731d3360844ae580fe6166bbffbcdd505e93e92a73ba9e38f1f27e8a1b5d84f48b0
 MISC metadata.xml 441 BLAKE2B d0c43a24b0a988b9b5d30a7c0d002ca45587c13f166dc2b43cfabac3b4c73f78a57cbee98d5967609dcaff3bb8e25b6be2df2f6328fb6b441e5b15d3dc0ce9bf SHA512 aab164bf0b80548a5867b8347963f9bc8dde159e879fc464e8b12e9a1f7bfa0dad572d453a28ab5d0fb6169cc6238f9a2f79016ee835b0560396f1631b3f3e85
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
index fce6b6a04428..28d438f7c840 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://fallabs.com/hyperestraier/"
 SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="bzip2 debug java lzo mecab perl ruby static-libs +zlib"
 
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index aedcb1ffb43d..3c2cb2673b24 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,6 +1,4 @@
-DIST libmwaw-0.3.19.tar.xz 1401720 BLAKE2B 93e63993dd73d52d1b071c44a5efa4ba2495a370a767cd80fbeb437a56224d333781cfdf32c3ca1c0a3794544da6cdf8c967badf98b6858796fbc8f2ea7878c1 SHA512 a5b74f417366f7e8a8303948e678d54caf9c45e0b51694d39593926b2f2fbbaa5dfea5dee8a6b4a656e5ca5bd880f41a76e7b869f55230690740b7ab75a28f1f
 DIST libmwaw-0.3.20.tar.xz 1425812 BLAKE2B a708ce4a28a0d5a5a5ee9d178c67119189add0180e61d67af6821c509d95b9f8bfb60eeb1afcdf8e2da5bed26053108b12db57db98912d97dc7e0ef0f7121f18 SHA512 d6cd28629b6482dd61e070036e94568ecc44d9064dddd9c699c7362caa8ef36652ce84cf0f199813854636f2e39ab19d47f4e148990822791b88cd3f17f68b3b
-EBUILD libmwaw-0.3.19.ebuild 1004 BLAKE2B e6db19e89201be0df73cb6dd3deb81eaf2e08d442c6d958826e95120d14ce2740248158b3a1f5084ae4b9f588d22d62c4794f090f0c58aebcde48204ea256560 SHA512 2ba0bc30818fc9b4032698081bcdea307185e24dd08885168d05ca6ab43bbb6dd2747cfa2268a5416e31c4050fcada5bfcb32bf605d4eadba26cf766b407a2f4
-EBUILD libmwaw-0.3.20.ebuild 992 BLAKE2B 4a20b55c2a0fc09cf47782dc2e69e5c13ed91ffa8bc87939fbecb361e3faa4676fd70d3c70dc01a6d1228456d8fa904ad2992cbf4e1e587105dba2048bf5b0ff SHA512 3995087709ad115c143efcd9625320028cfb8c7a58aeea08a2ba2b98aa75f6eb46f41857f380873ce745272fa69f371839fff0e474a672efe390f8ea606794ed
+EBUILD libmwaw-0.3.20.ebuild 990 BLAKE2B 458e4695a6b2747587b73a2f952d0771ccd31d7410c869f5021955e87101f3aa0f3e5fce16e7770a24474f7790f0eb5615dcbe0f03286d42afe2a6f91f6b4021 SHA512 a492deef4a74ffaaba4adb3705d772c513c0551ab25f66898f7335fdaf15a90a09d9207f5314ebacbd7cc765560361253984e1a200961af77ccb055a1e08754d
 EBUILD libmwaw-9999.ebuild 993 BLAKE2B 67267f5263a9c98540db6033727d6276f9c033265d1afe2dcde1a9918ff3181ca2b8ae34ec96ffdd9ef0027cb8523ed54f9550dcdf86eaffa5af6c036793ec12 SHA512 dcdcefdb014c8a08ba5415fe53674371f0255fc49c8a070ffd2047b164b7083c280dd039287ba48c3b3be5e68f7cda543ea33e7ec53d1784041c7346c76519ba
 MISC metadata.xml 404 BLAKE2B 95ac1c73023ff52b4a0d1754f9d37b6c2ffd82f49f16122058f853e40ce15dd9b2fbe6ecc24bdf86e82addc27b4a6f9cd7478560fde845b696f62a1645abdca7 SHA512 858235729f5091f06699f4b32ff14890c139c5e0adff30172da79e3fec4b4452e8529c401a0273b1799706e0ade449451f10b84555ade12022bf62e37098ac07
diff --git a/app-text/libmwaw/libmwaw-0.3.19.ebuild b/app-text/libmwaw/libmwaw-0.3.19.ebuild
deleted file mode 100644
index 4f07691b3c39..000000000000
--- a/app-text/libmwaw/libmwaw-0.3.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
-	inherit autotools git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Library parsing many pre-OSX MAC text formats"
-HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc tools"
-
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	dev-libs/librevenge
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# zip is hard enabled as the zlib is dep on the rdeps anyway
-	local myeconfargs=(
-		--enable-zip
-		--disable-static
-		--disable-werror
-		$(use_with doc docs)
-		$(use_enable tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libmwaw/libmwaw-0.3.20.ebuild b/app-text/libmwaw/libmwaw-0.3.20.ebuild
index f4f82fb21109..31e61e239233 100644
--- a/app-text/libmwaw/libmwaw-0.3.20.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.20.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 22f671cca186..7b2095aaec35 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
 AUX po4a-0.60-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
 AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
+DIST po4a-0.64.tar.gz 4121565 BLAKE2B a579aabb4245501be4ec7c319e8cef91db2e10883a09ef5a7eaf2d97aad64e8e59f25101c20286c955067fef2f58bc08c9865d5d608dd72913a38eaaff0ac542 SHA512 3d51aaa5894365087523b82e218819ba8a92d3cbc1b389648526f26fbbf37ccaa7ed6643bb388e5fa73a7a1abadee2b4ee2ebbcac14790c56567bf1a3e766fb0
 EBUILD po4a-0.57-r1.ebuild 1290 BLAKE2B df2dbc33e75186c1e578cc4ba02ae7df6aeee4e14139d8b9174791a747ae4064012df67b169f11ea5ca84f3b5d96abefd92faf39a0810a9b8e7dbe865bac4c3a SHA512 28847b243fb6a82d9650a1088db67d118ee53808231d2907ebe349e79e66f754a15747981d59faff82365363be613a42e8b5691a9a0118060c9df2e875b053b0
-EBUILD po4a-0.62-r1.ebuild 1387 BLAKE2B 12af309cc2cf5872e03d169df317b1ebc785b5c5f20f06074b15a3c9451e275f9492e45aa9b69e5f524306ae21b9886776966d81610c6113d3bc02ac5ecc8477 SHA512 2577cadd4b5638e0ef18c95ab20a37ace2f22b455accba70b792829503eb70f9f01e6826c368cbfa8a02b46741323f0a663df994269c212bdbea2c4ac80d0ebc
-EBUILD po4a-0.63-r1.ebuild 1387 BLAKE2B 12af309cc2cf5872e03d169df317b1ebc785b5c5f20f06074b15a3c9451e275f9492e45aa9b69e5f524306ae21b9886776966d81610c6113d3bc02ac5ecc8477 SHA512 2577cadd4b5638e0ef18c95ab20a37ace2f22b455accba70b792829503eb70f9f01e6826c368cbfa8a02b46741323f0a663df994269c212bdbea2c4ac80d0ebc
+EBUILD po4a-0.63-r1.ebuild 1382 BLAKE2B d5df31e83007c984cfab67dd3a0ae333a24eac3f91ac9d188d92da960362b0e5ab5212a239d4100489f8e3e4e083bd8a7169c8cd80d48391f47edc8e6a940c6c SHA512 701dbbd20360d3eec66f0ce4aa4c25c17b5e3fbf4e7a9ef0fc5ebd209e329a298ee384dcdcd06a9791701e9e960d0251d73e149dd6110e7ca6e6b47132564c17
+EBUILD po4a-0.64.ebuild 1397 BLAKE2B 4aeba42b51780c8eae9fe0d594a286aa2febe52cd07cfe2b905742fe3aa44b7200f03fc242eb318a59142897a7b8a2badcfefe6d60eabf7fea04c994b583f32c SHA512 b6f5a4b8581599f3f2eb1d9ec36eba749be90c2c58e373cbb4030a56667c940d8430b836af329d6daa222c269b6076864461d85794e13f39770aff8ad8fa2e75
 MISC metadata.xml 327 BLAKE2B e4ac438b10bde7e247b0f098c104aa9956b264df04c81d10aff0f0a0ae45184a953443062f38bbc5fe0c7fd9a4e48219c5e0a76c5bb0b4fee9edf51e35ad50ec SHA512 934e9519050daf07edfee9e4a0041d808ea5eec4d414b738f1e2b909e821b83c8c7b39a15170041a9aba31df1c1a0b6323bd245507f7c9bea9556a332c6939ec
diff --git a/app-text/po4a/po4a-0.63-r1.ebuild b/app-text/po4a/po4a-0.63-r1.ebuild
index d2312dd067e5..327a425c5059 100644
--- a/app-text/po4a/po4a-0.63-r1.ebuild
+++ b/app-text/po4a/po4a-0.63-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.62-r1.ebuild b/app-text/po4a/po4a-0.64.ebuild
index d2312dd067e5..d1d6f4f2dc65 100644
--- a/app-text/po4a/po4a-0.62-r1.ebuild
+++ b/app-text/po4a/po4a-0.64.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+PLOCALES="ace af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK zh_Hant"
 
 inherit perl-module plocale
 
@@ -19,16 +19,15 @@ RESTRICT="!test? ( test )"
 RDEPEND="app-text/opensp
 	dev-libs/libxslt
 	dev-perl/Locale-gettext
+	dev-perl/Pod-Parser
 	dev-perl/SGMLSpm
 	dev-perl/TermReadKey
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext
-	dev-perl/Pod-Parser"
+	sys-devel/gettext"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
+BDEPEND="app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
 	dev-perl/Module-Build
 	test? (
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index 725130450485..d9f143576969 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -3,4 +3,4 @@ DIST tidy-html5-5.7.28.tar.gz 670474 BLAKE2B f1f030bda478f09f1786b34f62ac547249c
 EBUILD tidy-html5-5.6.0.ebuild 622 BLAKE2B 365c2b9c65a461c6bd460d8a1a74071968c63576256b901fea5ed1a3b309a6ab5f0beb92029418aa938b2f61c1565e2e334f7b8d49a687c3a190297636f11e58 SHA512 819f2d445f0eef9ed960f72d714299b1fd8652e1389cda4d029eb8fe801405f1f27bb2349afeab57af995057b70707bf2f41441156da324b434c1b89c8a83f67
 EBUILD tidy-html5-5.7.28-r1.ebuild 657 BLAKE2B 56d93051d4a52625a04378a25a580a2c5becbe17054cc981e661266e5cb622109cb4409777643523cd4cad1626f3e1a6aaf37dd817e3e17d1f9ae8ae46b73e51 SHA512 742b207ab47895fe8f658a835ed7f8d7bc93c22f813877efae9d3f97314b409422b4644141475e3f4ce25a43255547be05406d0718d215cb38736dfa0a6e5b5c
 EBUILD tidy-html5-5.7.28.ebuild 629 BLAKE2B a439eab0e94c83d7ce3773c6517d13bb100444465c0c18ed22f48d5fe9bc93b8013ac46f629e8b43a1ab80418170973cd50e22925e55f0d493308645a397c486 SHA512 46bcf18c55ec48c715ec8ccbae7f8fa917d30e3f048b1fa878bd2fa93cd8be8590f171b99af4615c4c2e83cd65d862da59a01a554afced75675f84c6ad847025
-MISC metadata.xml 334 BLAKE2B 9ac5ac5d5cf67171e47ca36617d54f9eb51dadc1e270356da17b7005351676e06e7de4c813272e7f7ff0e31bdd4187c441348a9aade72aa13aaeae13232baf11 SHA512 3d6a86c84afb622daba47680e3998f5f228c99a9c348bb5e5c022324e52568897af8379d0e64f0076e1ebc78c5d1201711bbac07b36eb9e492ddd40d3aa5be87
+MISC metadata.xml 333 BLAKE2B ab8e7b19f5faee36ecdf53b1ff84745eca5de48a57ae7340e4ffcf41de8b1122954056731c3332149051258bd86fded7a59e59d2251ba69704a2a9d923ce275a SHA512 88610a32e62fcb5995d66f78060384f44825d65644da4fae79cba5e5f93bfa150767873b0864dc7317d7e84c563ba54e48f53cc7d15c448a65d4bbe3154380f8
diff --git a/app-text/tidy-html5/metadata.xml b/app-text/tidy-html5/metadata.xml
index 42d16d811efe..541e52bb72b7 100644
--- a/app-text/tidy-html5/metadata.xml
+++ b/app-text/tidy-html5/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Patrice Clement</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">nhatminhle/cofoja</remote-id>
+		<remote-id type="github">htacg/tidy-html5</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 8f9a7c448d0d..45317ac61c3f 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,3 +1,3 @@
 DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b
-EBUILD txt2tags-3.7.ebuild 527 BLAKE2B dd883a6ceadb7ce4ff5bd806d8ba26044e2ab2c9f44edb7b3fd4b7fea7e0df279c99fcf8c77f79a20632afca64181fab8bde2e4b393bb47fb5c08a3818f7a57c SHA512 b747adea3d877262c50b7e1662bbd318730ce85aac5093cf5a90bf414df27dcf97a4082d06a837cefafa05b391942e4f99ae29e151b76ce82f5e544aadf2a835
-MISC metadata.xml 246 BLAKE2B 5a42ab13bfe10131d8081b34ae858f3eb96a8a88e89d8dd3462ed063bee3e383727b43bf521f069f035be952ae0a89142d4023277805c3386e0e9ca02c663438 SHA512 5d3b25f302ace96650aaef13255021c8b8c04384eb32ffdca446215230af6487f22ff5751dc026b3a0a44fbc0ea077291e7659b341cdc34399d4ad7773bcb52c
+EBUILD txt2tags-3.7.ebuild 589 BLAKE2B aaeaedbb49a9cda11cb923a45c40f7091443bc89cdd37c946f845889219fd454ec11dfbb296798dfd36500c831757b7cc6f51e198209aa7bd1127419eb538f0a SHA512 b0d7ead647cc98ca5499b8a88887e489cca126d3ba1433412ecf82de5750efc9f6525c5569fc624c2bc79103b43c115b6b5eafa6f72696628f61bc51868a8a78
+MISC metadata.xml 327 BLAKE2B 79caa85a22266505adf216620e41aa53de9ce983efa00a1d27edb67c4cf21fca9b4bb8e7db45245b5cb6f822bcddea99a1c9b9b5f1b30289cc102e97b282bb09 SHA512 b7e39787d71c2ca7ee776b8c13dba71bc573db82d2509e634aa9c25da86f37d20dbff3819cbe8967c7884f3ca1066dc6c399e95ba09311e9ff3ff38dedd911d6
diff --git a/app-text/txt2tags/metadata.xml b/app-text/txt2tags/metadata.xml
index 69b8e695a28a..9ec2b5c95248 100644
--- a/app-text/txt2tags/metadata.xml
+++ b/app-text/txt2tags/metadata.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">txt2tags/txt2tags</remote-id>
 		<remote-id type="google-code">txt2tags</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
index 8a244a869e9b..bde19fb5de14 100644
--- a/app-text/txt2tags/txt2tags-3.7.ebuild
+++ b/app-text/txt2tags/txt2tags-3.7.ebuild
@@ -3,15 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
 HOMEPAGE="https://txt2tags.org"
 SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" run.py || die "Tests failed with ${EPYTHON}"
+}