gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-text
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
348 files changed, 1797 insertions, 2116 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 756c82029d9f..c258dd8b0b57 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 01c6cb9d2f2a..b0358bba1044 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -16,5 +16,5 @@ AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a10
 AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3650 BLAKE2B bdfd96ffa93bb7a2e6b174a8295e9bfd4a08027e451a63415e1d815e55808d56ec863209e0fa6008355be2e07d97c44f8d1eeee9223ed655de3517e9d5a3353d SHA512 ff6542505258ad77f2a55bcba5dafc5303f72676feed546d1d079994ca40ea850558a6db93bb7f94d58e9944967dbcdb8d5e19411ec58876fe9460ea047884ae
+EBUILD a2ps-4.14-r6.ebuild 3648 BLAKE2B 4b8017dbbe481e0410de1fe91278188a17d511b596816a2d5d5e411b57fc1220fa6417f378ad816075a35406272b2a50d15474a37e9d6f1e5f919f199b6ae989 SHA512 a58d4111e64afe5f978d321042857c95d29855c431a40cc5d8730cc495e8206536d1c37472996bde392b74d8d1899308f16fc37132205132bd154c614a4715e4
 MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index c8d8627a3fb9..c8da672d4e7e 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
 
 RESTRICT=test
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index 99469c969525..61a25da46990 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -2,5 +2,5 @@ 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.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
 EBUILD aiksaurus-1.2.1-r1.ebuild 911 BLAKE2B 123b26f66856a3447fd19c282cb6b33dc2fd82d0cb98fa36b8a09fa798a410f6e6f202da88a03ae6c87b6a640b6b4b97c10cb9b7034d71ec8480e1f191646711 SHA512 81e07f8b5aa16025e0a6a980eb0d5a42d2d45001a660f72ac5aa9148693dd101975c5eee1ca0c87355313194651cf378757ea6af4b5d7e23aa721a644bf5e5e1
-EBUILD aiksaurus-1.2.1.ebuild 791 BLAKE2B a3722c83b806a848c6997fcbf6722818b6f71f54780d92f198b5172b6a8a84ce3c944681ded096aadde9a4422c88d4c287cb0fb819406c26f6abd111cf2619b2 SHA512 504c6d544592643589da5942bb1e8b2a50450bdedf3eedc88fed2cb9282269d47838e7daaca302ffc4de8970e72321bb2706dea4c7a2d90c0174e1cb6f9e82e6
+EBUILD aiksaurus-1.2.1.ebuild 792 BLAKE2B dbea7c8127b13263e87dac48c1acf606e91eeb0455a4ca9151da2c5ae74098c0a4282db99f36a1ab46f764afa65810e5ca7726b919d44edf679cf1e27e25a5f2 SHA512 54e4f2addec2514af7f3c734aa99354713b7db43175cc18a0da8179afc001f6b89a266306160dc97d556aad3614cf556100c5df5cdf14c1d71f010b43f1ecb7e
 MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
index 1e3d8f8861f7..fee561edee06 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm 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/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 3f6e5ca8d195..a94bd67f3145 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,3 @@
-DIST ansifilter-2.15.tar.bz2 441381 BLAKE2B db55f8a21aada3aa851a099e5a19a3f3bbf81b8ce5d75b31600cbc47f409306e74f57ff51c52266212fa3c59730fac0d416e99f1fefe8a7009bd357ea216b0cd SHA512 4c30ea11665ce0876664c77fbe69c377d5e692508a54b4629e9b6363c1f223b65ac91d20fd61d6d8cf719d1b391ca6d94d69dabbacde7c2dc460330d530a09af
 DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
-EBUILD ansifilter-2.15.ebuild 1004 BLAKE2B f80c1c12d0e25bc8596b4432bc8c1c72129650a2377d11d57b022fe17d67a1bdf1a957121bc88b0402f94b87a23f2f12f32bdb0cbf10dfdb2fe3d98fe5955b35 SHA512 411f165414fea2f9832135a2b9702e1f9d41cf41f00968e801cff6864ca3b2a34944eec63362c6eec0815def4094b124ba79dc05538db1a53486019eb89b4d01
-EBUILD ansifilter-2.16.ebuild 1006 BLAKE2B f75045ae4f6e6e87ae7217910f8f8502f3d4a32746cc7dc93e2ae13a47d8c926d4835c77ade3b0bbceee213d2a281bbb7fec836b3eb80e0ff5806462441f4ad1 SHA512 151af390ea256d12d9c0fd3a5776ca7d1aabaaaaadd592cc6aa1c544a1fcfba619b6e382d8d78573f2210e2beb923188b75a519f99b25728124b7f24c4d45c02
+EBUILD ansifilter-2.16.ebuild 1004 BLAKE2B f80c1c12d0e25bc8596b4432bc8c1c72129650a2377d11d57b022fe17d67a1bdf1a957121bc88b0402f94b87a23f2f12f32bdb0cbf10dfdb2fe3d98fe5955b35 SHA512 411f165414fea2f9832135a2b9702e1f9d41cf41f00968e801cff6864ca3b2a34944eec63362c6eec0815def4094b124ba79dc05538db1a53486019eb89b4d01
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.15.ebuild b/app-text/ansifilter/ansifilter-2.15.ebuild
deleted file mode 100644
index 0481ddcea6a1..000000000000
--- a/app-text/ansifilter/ansifilter-2.15.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs qmake-utils
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="qt5"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# bug 431452
-	rm src/qt-gui/moc_mydialog.cpp || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		eqmake5
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
-
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	dobin src/${PN}
-	use qt5 && dobin src/qt-gui/${PN}-gui
-
-	gunzip man/${PN}.1.gz
-	doman man/${PN}.1
-	einstalldocs
-}
diff --git a/app-text/ansifilter/ansifilter-2.16.ebuild b/app-text/ansifilter/ansifilter-2.16.ebuild
index d4c9c6144d6b..0481ddcea6a1 100644
--- a/app-text/ansifilter/ansifilter-2.16.ebuild
+++ b/app-text/ansifilter/ansifilter-2.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 56f8fd59b409..f8186db2284f 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
 DIST asciidoc-9.0.0_rc1.tar.gz 1143528 BLAKE2B 97e2ee77cf7554e2e0d53e792213377e6cb233853717487b0c0ac1c70d233a5d58a08f3aa69ae840c90f98185b595f9feb7396795b2de47ff0cfc0147920bc2a SHA512 965d65df18ff90596e5cd72bec8d0f7daf2f6ad585ec77af2a6ae9637569b613e2384cc7015c1823fcde99be8170107789505a543fe8b6d3273f2c75a6a92960
-EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B 4ae19fa2b8362818e9b5a04226aa7c4b57dd027efab22b0c9881ee3c3ce0d6b4d5ed903f03e0a26962d93ccdb125d73b1ef9e0a22178fb54fe28ef186b42ae2e SHA512 b01efd0d8d1b03de83bd39b37fee70645812795dba6136ea0410258793f4775e41a7ec9392e4b572dfb2db6bd76582de0a605704bb0dc026025044f5e971fdf6
-EBUILD asciidoc-9.0.0_rc1.ebuild 2727 BLAKE2B 09cf677eff56b5a84cb62b36ce2baae2a132806f1fc860546058a33d49bc6d8123668d92b348fed330c33e265113056e2aa71ada291db03e0bd484f8375115f6 SHA512 6acaa452918764b6151ea17284e4b528c88a89bfc3f58796ab5e4dd81d80f39fd3eae364bd1353ae2b39a21945e13732e64019e20674a962d7c3b8b39d489298
+EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2618 BLAKE2B 629979ca8be6e196f00771000485ce7d07cf93ead3cab06503cadd86d3188fd518f9f72c9d31e83bf9cc25eb9ef52fa1507f5e1dc6801fd79239b4116ea47373 SHA512 995be2c3c205cac07ab2ac824929d1b846020c1ac4d93463f2ef5ef268e810b71b9b25e19c6abf94bae094e9417dc57728c71a5985b70f8875b849b4ce4800a7
+EBUILD asciidoc-9.0.0_rc1.ebuild 2723 BLAKE2B 4c300f19755be00bad844c09c252f5ba06985c7efbad1acddd7683d6fa5b261479eb6ced3554df9163b841cb23c23e2f3744376bb0bd733f68d2363b5f908f9d SHA512 45e514127164f15dea2c3715309beadd08c8dd1f6d999a7399769d5511d4bda48b5972a63bc6d237830d5eb8fc14a4d01ef3e0de6f08f67b8f4c127f7dbc19e1
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
index efbd0590a066..105a77cb11bd 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
 MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
 SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
index 1b8ec0e44bfd..ea4593547f48 100644
--- a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils python-single-r1 readme.gentoo-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
 SRC_URI="https://github.com/${PN}/${PN}-py3/archive/9.0.0rc1.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 820c1ca9cf49..206fa437e50e 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -3,10 +3,6 @@ AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db
 AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
-DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-DIST aspell-0.60.7.tar.gz 2071890 BLAKE2B d0c8780179cca304361b9d58be667f3dd99d9319cbcffd92a0cc69c65c3a40410b10f6953471ddd9d6df355b557761ffff71ccb5bc6995a57de69a9adb07db66 SHA512 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
-EBUILD aspell-0.60.7.ebuild 2760 BLAKE2B 60bdbc0c7b9bae9d1581b56739f787757e4f997df5555ea281d911a6a499c6f8e2f868585ff56d91f0fd623fb02dd621dba4cb5443737451404ca58cf587e4aa SHA512 e1b48dfcba09975fd4648483b5923ce598eca3f61a0caf9256b2ac6986c12f56ac3911a74e70312b2d84e0c7d4494ffc190b57ec17683f60846fdbaf538c88ad
-EBUILD aspell-0.60.7_rc1.ebuild 2694 BLAKE2B 60919f9c3ca7f22c76739cc4417f3797ed37d190f33b63f6963149f5aa889584603e7bd37e8c283ec04d6e73db556d2ecad87c73b7ac144cc463638993bf0170 SHA512 9f7c7476a0e3cbabab1c6f2e0eea5e8e19274bac66d054bd19af2a15525a2c9477b49176634d168ffc3d314775e579ebd03194b6541381599e0f01309dad88d7
-EBUILD aspell-0.60.8.ebuild 2760 BLAKE2B 60bdbc0c7b9bae9d1581b56739f787757e4f997df5555ea281d911a6a499c6f8e2f868585ff56d91f0fd623fb02dd621dba4cb5443737451404ca58cf587e4aa SHA512 e1b48dfcba09975fd4648483b5923ce598eca3f61a0caf9256b2ac6986c12f56ac3911a74e70312b2d84e0c7d4494ffc190b57ec17683f60846fdbaf538c88ad
+EBUILD aspell-0.60.8.ebuild 2747 BLAKE2B 1dc9da32ba80d7b30ab7ba9eca3ce2ce62614696ea3d61a97d65dc9a6387cff2e954e7f3a43a9e9144b792e136bc28fd34192d0fd08d54df7af5f9d66621256b SHA512 e56e687f6ebffb3ab82dea0783a7671afb353e74d9d0c94ec68718d4219ce297cbfff32c9f38de508a4911e2b39c120c0e0403cbac595887b95b4ff6ad3c244b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/aspell/aspell-0.60.7.ebuild b/app-text/aspell/aspell-0.60.7.ebuild
deleted file mode 100644
index 54907d973247..000000000000
--- a/app-text/aspell/aspell-0.60.7.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-if [[ "${PV}" = *_rc* ]] ; then
-	SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls unicode"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de-alt"  ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	nls? ( virtual/libintl )
-	!=app-dicts/aspell-en-0.5*
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.5-nls.patch"
-	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-	# includes fix for bug #467602
-	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
-	default
-
-	rm m4/lt* m4/libtool.m4 || die
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
-	# unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
-	# any more.  Fix this.
-	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
-		append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_enable unicode)
-		--disable-static
-		--sysconfdir="${EPREFIX}"/etc/aspell
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# install ispell/aspell compatibility scripts
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	# we explicitly pass '--disable-static' to econf,
-	# hence we can delete .la files unconditionally
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
deleted file mode 100644
index df49dec124c5..000000000000
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic libtool toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-if [[ "${PV}" = *_rc* ]] ; then
-	SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls unicode"
-
-PDEPEND="app-dicts/aspell-en"
-LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
-hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de-alt"  ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
-done
-unset dict lang LANGS
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	nls? ( virtual/libintl )
-	!=app-dicts/aspell-en-0.5*
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS=( manual/aspell{,-dev}.html )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.5-nls.patch"
-	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
-	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
-	# includes fix for bug #467602
-	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
-)
-
-src_prepare() {
-	default
-
-	rm m4/lt* m4/libtool.m4 || die
-	eautoreconf
-	elibtoolize --reverse-deps
-
-	# Parallel install of libtool libraries doesn't always work.
-	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
-	# This has to be after automake has run so that we don't clobber
-	# the default target that automake creates for us.
-	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
-
-	# unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
-	# any more.  Fix this.
-	[[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-musl* ]] && use unicode && \
-		append-cppflags -DNCURSES_WIDECHAR=1
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable unicode) \
-		--disable-static \
-		--sysconfdir="${EPREFIX}"/etc/aspell
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc "${S}"/examples/*.c
-
-	# install ispell/aspell compatibility scripts
-	newbin scripts/ispell ispell-aspell
-	newbin scripts/spell spell-aspell
-
-	# we explicitly pass '--disable-static' to econf,
-	# hence we can delete .la files unconditionally
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/aspell/aspell-0.60.8.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
index 54907d973247..b2929d84e9c6 100644
--- a/app-text/aspell/aspell-0.60.8.ebuild
+++ b/app-text/aspell/aspell-0.60.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 81cf87bdfe8f..ea5f48dffb8c 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,3 +1,7 @@
 DIST atril-1.22.1.tar.xz 1766980 BLAKE2B 0b7b1a7dfff13c5d803fed4140596940b20a322fce54c9f0faecd8e80bdc1e5e498603851a10a88763b20444377bcf4e7b124ac08953ab6aa4b3b2cce021a46c SHA512 838ae397c868ac417c9266e4a06525d66214650cf8647e91c1472d83d50c8954f6dbb29411384892a98f0929e1fbac9947118bd0db10d50400fc0d5270a3619d
-EBUILD atril-1.22.1.ebuild 2138 BLAKE2B 2a8a895fd05a48d4a0ebc5056a6560b710b51f1f3fed7cff4346310022c4d59b8dc4ce831c0044ce081890be4713a14220ef59f8e9adfc4836a344505bfddfb7 SHA512 664c74e3e5c7aca481b2538838b1d170c1bca280e5ee7f4f1c3b61dccf514dad910013144655782d3764da6e45fb6b11d6ed67e4a13c53f81ac75baead26452c
+DIST atril-1.22.3.tar.xz 1798396 BLAKE2B 1f06585393e1a9a6d51b7cc50c52bd61e8e115aa3985ffca0233c2e09219a88c3a30b4ddbcc70bfb9ddf663810e6cc67e968f8a32bfd4a3f07b4646e896a7f18 SHA512 f4a83702818e1fb32279c67f1727c01480d27fe756f3fc0ff9dcd42584ce74ce10ac7ee81c0149f3756b6eb08f2a011ede28706ab54ff16a51c544a1af3b103f
+DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293
+EBUILD atril-1.22.1.ebuild 2173 BLAKE2B e1306cbb47dd78e18ef826a6f607668eaeb38f3323420ff1bfa5bef47c90dbfaf2776a040d89592ca0662341db5a458839e4d971222f2b32b48b655357974c41 SHA512 385379581433704ca2da56286ded25422387b640bde61ecb10cc0c4903811163350c0b11b95e963cda325da7fd3ce54ec06ccf9a67b28812ec599fb584d13178
+EBUILD atril-1.22.3.ebuild 2175 BLAKE2B 5dd028733f7f347465e04a9f7bfa4ac5a9ed5077dbf86bf82241463ab03d4d6f6cae2fcf08046d234b2476ebe0aeb0c5b32b2aaac050d93c4434284a5a6e3af9 SHA512 f5711b223292ee957e962c672ba372ffe5d02425392bb77f44d67efb06b5387c77a8853b85b4e6dfb6f9510b4f46dd2f4d57f0d0de645c23077c06ddfd824d06
+EBUILD atril-1.24.0.ebuild 2234 BLAKE2B a55e8356aab30caf603b2506ea37c271f781ccea281d87c0740b2702e57980940ae6c96366862f516ca700ccc47a894c2c3d9b4b171a95aaca425a0bc3a2bdd8 SHA512 963bbe109cf829d5202a6dc93b34d2be21f53f4d2af655335e403445d52260387382289673f604e849bdaad6da505f4f85c842f6c15d304a0d7ee9219c841697
 MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
diff --git a/app-text/atril/atril-1.22.1.ebuild b/app-text/atril/atril-1.22.1.ebuild
index fbfbdd9bd521..c5b3e71e514a 100644
--- a/app-text/atril/atril-1.22.1.ebuild
+++ b/app-text/atril/atril-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
 SLOT="0"
 
 IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
diff --git a/app-text/atril/atril-1.22.3.ebuild b/app-text/atril/atril-1.22.3.ebuild
new file mode 100644
index 000000000000..db8529d7bdb2
--- /dev/null
+++ b/app-text/atril/atril-1.22.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+RDEPEND="
+	>=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11
+	>=x11-libs/cairo-1.9.10
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? (
+		dev-libs/mathjax
+		>=net-libs/webkit-gtk-2.4.3:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1 )
+	!!app-text/mate-document-viewer"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian
+	app-text/yelp-tools
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/app-text/atril/atril-1.24.0.ebuild b/app-text/atril/atril-1.24.0.ebuild
new file mode 100644
index 000000000000..0f89edd836ad
--- /dev/null
+++ b/app-text/atril/atril-1.24.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11
+	>=x11-libs/cairo-1.14
+	x11-libs/pango
+	virtual/tex-base
+	caja? ( >=mate-base/caja-1.17.1[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? (
+		dev-libs/mathjax
+		>=net-libs/webkit-gtk-2.6.0:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!app-text/mate-document-viewer
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian
+	app-text/yelp-tools
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig
+"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index 4c14ef5505b7..958759f18727 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,5 +1,5 @@
 DIST console-setup_1.104.tar.gz 3272857 BLAKE2B ae7a5929a059ddd2258884e5207198ae517da1284e264527878ad25bf883e48b399e53f2a987265623a5cffa3eefce8cce5fe8ad632576c46bba40689c17c586 SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
-EBUILD bdf2psf-1.104.ebuild 681 BLAKE2B 7d98cd715f1e4adf8386e7c44c660a7d198506dec31567d2ce1940717416a437254d6d233de7ca9800d1fcb2a829acf6a66b3cc282e2379fab76c5879f638fdf SHA512 6bb9ad8f266796f463f07ed584c69b6d570ad8b24b54be78cba70816f057f3c9c6a8e11d7f2e60a3723988c59c4e9a508b86ae462edc1e3b59305662b016f678
-EBUILD bdf2psf-1.155.ebuild 691 BLAKE2B 68b89128f921c18f77376a4972da9a258e11b53f2ce973a83584e3c8b52750592f6ed2b97e49b90934f395b81e2024a4b1b68406eefa1451e863808f58cf0631 SHA512 39cbd5722bad1f5e8e25e2edf14a52d767eaa8fab75c56a043d7aeb7b50f28ec412e479989189f512f1b60207463084e504f75437031ca4d0fbfd96411ca0487
+EBUILD bdf2psf-1.104.ebuild 678 BLAKE2B 357443c76f206854737eec7b9d32561515339e316428cc2c45d4bf9e222d36deebcf8191774961089c120eb074c8c357259d527d8e32183bf04dff7851e42226 SHA512 54f8ee43215a9e2de7eef0a5d4732d07fe26ef6f68c22732dd616f012e781f44115b01e80516cf5e585140fa91be4103e4d41b603b510b74ed6eda37f05b3460
+EBUILD bdf2psf-1.155.ebuild 684 BLAKE2B fa1f1cdf8c503a41350b7f91608c5796c44b3bf8c64d16d69985d570b57de30171b48204aaccc11f631617824a90a2a77c340427ad625cd6ff4f83b6624d5da8 SHA512 e469d385937c8aba19ed9df46275ba4030757e861a429efa80eed72ae0e8c78bc6edaf0c51a2833254d9d7520503fb66af69f3387fec8dc6a6d3a487bfcfa2cc
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
index 2967a8198541..0afc4dcd9ef7 100644
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
index f0e61fad5df4..96a51f59dd1d 100644
--- a/app-text/bdf2psf/bdf2psf-1.155.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.155.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index c26cf67cf9ef..aa29ac7ca683 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,3 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.21.ebuild 1072 BLAKE2B 2c45f736bc153bc364fe8ac8ce01fba7792752df6c3686fd588a1f8797073284669bc6f7149a05eff22f89f4fbb19df23a01e39a97cbee6bd8d354c46b42e18f SHA512 544ea57529b9a94a23b67dd511da2f8561849ad6a14f42f18f45c4ed8eeeb8b11fe73d9dd8dce0e362ce709b590306a2c4697bac3242750edf2adecfd6b1e25e
+EBUILD build-docbook-catalog-1.21.ebuild 1070 BLAKE2B e022ede44e914cb1a7366ae0d85e931928ad8cc0196a96d9256c1cbfbb8a7ce196d5ee179a0a1188e01800f49387dc460f0c37c7b85224bfddf625a013a78c05 SHA512 52040cd7cddb1c3b42331b6982e6781612c7d62ac0fe2b1c0ca96da8beb9a083b35012eb5f39984fa9e764f53ec7fad9b695cb3c1e57dbc30c463d2b835fdfb4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index caf0c3de402a..50a18c2a475d 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 7794cef8941b..6fab06126651 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,12 +3,10 @@ AUX calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch 2717 BLAKE
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-DIST calibre-4.10.1.tar.xz 37012272 BLAKE2B e5d9421ed986da8ec7d814f364702fe04bcbb76b5e08dedfadd7164c81943cdfe6f012042e82a4715e3ccda284efdf44340af0bde9d03cbc7c22cbcf10136a55 SHA512 eb6f4fd458da3e3e1121ff72da0dfb2bdc38cec98bdaf538e6761563aa176aae2439e4949424795c239a8fa8ebde507564452495ef71f3f7f19b25435e10a41a
-DIST calibre-4.11.1.tar.xz 37042376 BLAKE2B a21a6d01afce4f0a02c1fe6cfba9a77cabd88da72ddb761368ad606d6eb08e3126bd53099a075c26503e91187699d4fef5e8ab3290b7c1e9c94c8310db23af6f SHA512 b6ad65da63f1ec5665116cfc82b8bc1c462d94842d1f53034417db6aa5fbb2e4f90801cba1daa76c54a2c6689e14ae12857cf234afe90356931b8458aeb5ab5a
 DIST calibre-4.11.2.tar.xz 37045372 BLAKE2B 7d76d45afd9228d6346daefaf4ee7cbf4d3281379c96d0ae63b3073b6b5ed055bd2eca0ae728f1471460e3aa8cf9b3afa3e489c4c2f02c6849b39b94e2c2023a SHA512 64f1779ea16e2aedbc91e815b015ffbcfcc2d50035dddc9b33588007ceeeaa5cf4cca84b40fbc9c5808e9b6dab3b04047f37505815120a1e66650447363672f2
+DIST calibre-4.12.0.tar.xz 36823140 BLAKE2B b8dd24152b79790c8d22d3c0aa9482f69250fe177499e01c6c0564bf31946d0266a2e3053549f037c7ea7626b18a27798097bfbe0caf93f97585d4869c475ab9 SHA512 628308273b507ee2557cd089e5c7b77f8304c1728b9aadfe5493b22042bdcf2da4c07652a6432121b5dd432807bcda21fabb81c37e59f87d24ace52539f3244c
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
-EBUILD calibre-4.10.1-r2.ebuild 8619 BLAKE2B 378dc8e78725a0b11480b9ededf2248626c215eed04f7f3e06cbe60029aa5ca73dbf72eaf718a551b6391ca826be941c9e3f3c46e4ab44e3decd728bfa82c517 SHA512 ea9465a3d1954af1a94f8427f7b3c3b1521a405f0eec15d16e6f7641238f4a1021d8b4bc10d3cb353ebc4fce502e83060296b87be08e886f5a9cc1ce9f5faea7
-EBUILD calibre-4.11.1.ebuild 8568 BLAKE2B c42797c17b08b81152ec019b8a995e83c07c9701ba2fae7f3ce876c214544de7af835f77dd9f4fe3ee5fd710969c4671a5aed178fbacaf2a465c5fc7104b279e SHA512 1a659bb78ad25a37ad4055c9ff4805181738052d2c420b81ae5d34b7c69b6ad142643f98bf31e4f084649b1036bfdf154e856ad900fb6af304f3eac3c88f29ca
-EBUILD calibre-4.11.2.ebuild 8568 BLAKE2B c42797c17b08b81152ec019b8a995e83c07c9701ba2fae7f3ce876c214544de7af835f77dd9f4fe3ee5fd710969c4671a5aed178fbacaf2a465c5fc7104b279e SHA512 1a659bb78ad25a37ad4055c9ff4805181738052d2c420b81ae5d34b7c69b6ad142643f98bf31e4f084649b1036bfdf154e856ad900fb6af304f3eac3c88f29ca
-EBUILD calibre-4.9.1-r2.ebuild 8617 BLAKE2B e8bdc3e44335fe1d559f992ba44cf987a9bdf787b68f657706712561656d8c1f440ae351a7e4834d60923c54a890aebef0d4404325378879105b57d3cb88aa4c SHA512 10e2905269e874033af8cf968e91b9c808c695a5efea5eb7b1fa5865138516f9a0cd9ef0c109738060a00f96065d9af683295346e321740592bfb1d5e6bb13c5
+EBUILD calibre-4.11.2.ebuild 8545 BLAKE2B d9d02091f3118ffe7d2fc7422e342c82a73ae13f7c761eb3d855b7f3837d8acace61d04ba36aa72a3e9ff7f543397f9911150cfb2feb32262eef8cf04ea080ed SHA512 77787afa92e929a8ecba0ef3a0c22780c4ec14a0ff70d8c8fa2cc9368b62f0ec0e97a91015f6222d0203ccb9fa10a25cd1d13a7429842ebf9c121d36af1bcff0
+EBUILD calibre-4.12.0.ebuild 8550 BLAKE2B b0f4c1162c29b2e23be790ae2798b13859cc0b22166c05afb699c043e82e13d5df9daaecd8be54ef05951816c0bcede1f2e257b4c3ff401a996e3d05fef366d3 SHA512 a3d9405e5f466465df447f75f5bedf893f17160a63ee44332b058be37eecc5fb61cd8954c04cf1a5377d90528f45520f10889dd5b8b1ae7e37cc6e87bfb4fbed
+EBUILD calibre-4.9.1-r2.ebuild 8584 BLAKE2B 9e4061e96e543b69260fa51e7408468ff6529a8276782e166830f4266a4b58e481e01ec761ba5e4a7b25ac5cdcb1e2cd7955926392368cb341da6a51353b3d23 SHA512 4a89fbc43197765fa47070537eed2663f6bceaf3f0ac9ec51b46aaba1b12b6a341d446dc8a094f6df08fddc968de191da8af57c5c767ae861adad4563d572047
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.10.1-r2.ebuild b/app-text/calibre/calibre-4.10.1-r2.ebuild
deleted file mode 100644
index 08411595122f..000000000000
--- a/app-text/calibre/calibre-4.10.1-r2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	$(python_gen_cond_dep '
-		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
-		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
-		dev-python/regex[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C.utf8 #709682
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.11.2.ebuild b/app-text/calibre/calibre-4.11.2.ebuild
index 25d08cce1987..b5a00a083e86 100644
--- a/app-text/calibre/calibre-4.11.2.ebuild
+++ b/app-text/calibre/calibre-4.11.2.ebuild
@@ -100,7 +100,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	udisks? ( virtual/libudev )"
 RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+	udisks? ( sys-fs/udisks:2 )"
 DEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
 		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
diff --git a/app-text/calibre/calibre-4.11.1.ebuild b/app-text/calibre/calibre-4.12.0.ebuild
index 25d08cce1987..0191479d6be6 100644
--- a/app-text/calibre/calibre-4.11.1.ebuild
+++ b/app-text/calibre/calibre-4.12.0.ebuild
@@ -31,7 +31,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="ios +udisks"
 
@@ -100,7 +100,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	udisks? ( virtual/libudev )"
 RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+	udisks? ( sys-fs/udisks:2 )"
 DEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
 		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
diff --git a/app-text/calibre/calibre-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild
index 799b96ca85b2..6dd804fe08ba 100644
--- a/app-text/calibre/calibre-4.9.1-r2.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite,ssl"
 
 inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
@@ -99,7 +99,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	udisks? ( virtual/libudev )"
 RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+	udisks? ( sys-fs/udisks:2 )"
 DEPEND="${COMMON_DEPEND}
 	$(python_gen_cond_dep '
 		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index a0551a7a6c27..9e8891e35b48 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,5 +1,4 @@
 AUX catdoc-0.95-parallel-make.patch 1568 BLAKE2B 868cad85a1882c60e1f6f37b630a233949c457afd66f59b1e07616a8403bcb4710cb7ed7d914e58ea2e5022787ad94a4c4db20572386d373b27e61257c5cb2ef SHA512 f40d7440bf19157b862226e8d956b5505e6d79db3a39a21f71f68d6943b162f62863333739f1f4777c2c38b4116b4745888ed0cf5cd4159ccc84d02979f691ea
 DIST catdoc-0.95.tar.gz 217779 BLAKE2B 37c01c485410a6eb08c5935351b00f60f1d4c418f4c1b3cca73da23f870cb5d5414ea6cf7c37effb295e6ccb12a7981367bd08ca6226ee0fc64d2dfdca2762ea SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c
 EBUILD catdoc-0.95-r1.ebuild 1347 BLAKE2B 84a1a8e91f6ad67f23090505bafc683fb03d0394109fd7c35eccb7179cd3159f20354dcbfa36e067e8bfedddf409edccd41e70f5b2823d7c7409e0bf92552927 SHA512 c1935e15391efa1e64e1c4f0bececd22d15b68bd92c3dcc67a990e0446a3621b3b84363727bfd7a9c2096fa8883c3cb2550d796545282f68866b62b55a41b4f8
-EBUILD catdoc-0.95.ebuild 1194 BLAKE2B 96629971c7c69ef5a46f6b0cde1ae1fd7a803c3d203c828ba3e7dbcceac53046aad29c62f524a48b691a7ff1c201bd13a2302239b9d84fa041779356d3ddb132 SHA512 48e93c76ff30043e9fb800109cdab36bd25e7d24895aede5767641b636a62ac30477e6a5dfda5d46a3d6c61f3cdcdd1876b3ecc6c0fecf539c06d7f3766adef5
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/catdoc/catdoc-0.95.ebuild b/app-text/catdoc/catdoc-0.95.ebuild
deleted file mode 100644
index 24c2ed8e4036..000000000000
--- a/app-text/catdoc/catdoc-0.95.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
-HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
-SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="tk"
-
-DEPEND="tk? ( >=dev-lang/tk-8.1 )"
-
-DOCS="CODING.STD NEWS README TODO"
-# CREDITS missing by accident in catdoc-0.95
-
-PATCHES=(
-	"${FILESDIR}/${P}-parallel-make.patch"
-	)
-
-src_prepare() {
-	default
-
-	# Fix for case-insensitive filesystems
-	echo ".PHONY: all install clean distclean dist" >> Makefile.in || die
-
-	mv configure.{in,ac} || die
-}
-
-src_configure() {
-	econf --with-install-root="${D}" \
-		$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
-		$(use_enable tk wordview)
-}
-
-src_compile() {
-	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
-}
-
-src_install() {
-	default
-
-	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
-		einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
-		mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
-	fi
-}
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index ad5fd0d0c8d6..1cac420f1280 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,6 +1,8 @@
 AUX cherrytree-0.38.9_update_setup_py.patch 748 BLAKE2B de89314f017fed48e2433bfbffd47b117234e779e80c9c2a8eebe80371be95a2b8f8fa4941544c674695121396e34e8b65c558ff3e642f74eab83d693fc22a78 SHA512 26a2f7e92717cd2e0e2f60b6df2ed2a861ba77a94b957e1841cd57f3377044ee1b52e179d3566795c9501472a76530a25f4c752a9046ac341bb533ead86c7d41
 DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
 DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
+DIST cherrytree-0.39.2.tar.gz 10044337 BLAKE2B 352b6b709e62487015eccf817c4aec799586f64b9e07e38f1eab5e1491b36d8e2ae2f62f55f32248ca1f5cc0c0f610282493de2f3d4cf4e128ecb66acb895668 SHA512 46a02753f02f17e9696e21510ad93222843734a8be271e3a20d7a038856ad99ff2c8316d559e56567e877e419324fe3b254882bb1578a3c8d85c902169cb0e26
 EBUILD cherrytree-0.37.0-r1.ebuild 1189 BLAKE2B 3f56b8ab0077d13fc2bdabccdb44a07cedf5de5308aee8f0a4a7122856f2341762fca3d7e8f354c19ded1387458f22f90a87dca8ef39cf22bbf5d37cc152c787 SHA512 928f4b904c7047936caa78239615895a1365a76ee3b1260e5db1cce3688ce1627438f7c5cc87f3825210b3be736a155f9be847c91c07fbc1879f7e6f1699ec80
 EBUILD cherrytree-0.38.9-r1.ebuild 1279 BLAKE2B 4eabfb8f4c185c614cd17e7310199fc6b18acae898b3c286f2e458e6a7c34c663526c059df1ea4a227ace16be5d2ce463f936cfd4671472c9e365e4b30148481 SHA512 97b0318bb9270fe1c18cf85b7330437633375f72933dae02f9918a5848bf388bd409fd8d8c639a874280341c4a739a1897cab253c8d38530db5f6482af9b688d
+EBUILD cherrytree-0.39.2.ebuild 1812 BLAKE2B 265a778104ce50f3d8996408cc372aeb73a34dc729bc61ad6c8b5043f8a403b98534fd1b1503a0a620571ea74b430652e7f265ba10a092734d780db51e9ce1f4 SHA512 e6e883a226cd98826af784565df0e94b615fe5b2a399da5baaeafbfb5cd3040c03c662af26ba4ba754ec61b103b1f56fc2678bb0aa1cef314cfb17b9078cd8b9
 MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
diff --git a/app-text/cherrytree/cherrytree-0.39.2.ebuild b/app-text/cherrytree/cherrytree-0.39.2.ebuild
new file mode 100644
index 000000000000..0c4f473d9b89
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.39.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools desktop python-any-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree"
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-cpp/gtksourceviewmm:3.0
+	dev-cpp/libxmlpp:2.6
+	dev-cpp/pangomm
+	dev-db/sqlite:3
+	dev-libs/libxml2:2"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-util/cpputest )"
+
+S="${S}/future"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	python_fix_shebang "${S}"
+
+	sed -i \
+		-e "s|\(CT_VERSION.*{\)\(.*\)\(};\)$|\1\"${PV}\"\3|" \
+		src/ct/ct_const.cc || die
+
+	if ! use test; then
+		sed -i \
+			-e '/^PKG_CHECK_MODULES/s|\(\[.*\)cpputest\(.*\]\)|\1\2|' \
+			configure.ac || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	pushd ../ >/dev/null || die
+
+	insinto /usr/share/mime/packages
+	doins linux/cherrytree.xml
+
+	insinto /usr/share/mime-info
+	doins linux/cherrytree.{mime,keys}
+
+	insinto /usr/share/metainfo
+	doins linux/cherrytree.appdata.xml
+
+	insinto /usr/share/application-registry
+	doins linux/cherrytree.applications
+
+	doicon -s scalable future/icons/cherrytree.svg
+	domenu linux/cherrytree.desktop
+	doman linux/cherrytree.1
+
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index afdcccde36fe..71d216c0d17d 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -1,5 +1,5 @@
 DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
 DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
-EBUILD convmv-2.04.ebuild 695 BLAKE2B 7543ea082b1b2ab1920c67fccd33c2a85bf750a0a7c4a07efdebda0bb365189b305782a5d4fc1a1533c1612b24871bcf3ec1450d667f31df52667a5fd79698b7 SHA512 026e2282b3994229aa52fc5bfbc8330e69cb7eb6af8fa156d028cbd2170dd73096ce7cbaf150cea5c4c4630fef7c3ff1ee0cbf75dd278bbb3f8d43eee12d9f36
+EBUILD convmv-2.04.ebuild 696 BLAKE2B 4b4bcd977727970df9ad3f760e7612b4fb39f55ea60bfd30a973a21f65864ab2470ae7222ad015aaf8ac66b57b8520285e7b87d8b37be22309c7c822bc81dbba SHA512 f69f37a90cce7e27142523d2124d2708706387a0c034435972ecc4af2e8d1f80615c9b0855adb6907234a719205b61b7354fde5394cdd47438c71c7dd242ca74
 EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/app-text/convmv/convmv-2.04.ebuild b/app-text/convmv/convmv-2.04.ebuild
index df6c6757adbe..efd8c049917d 100644
--- a/app-text/convmv/convmv-2.04.ebuild
+++ b/app-text/convmv/convmv-2.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index 2851478c5c6c..aa941096011f 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -1,9 +1,12 @@
 AUX dblatex-0.3.10-no-inkscape-dependency.patch 682 BLAKE2B b9dd747b3e0440f9e255f09e0a5b80e9218066a09cceb63fad5b2ea4507d4d11975f610726db3efb0f14a1701a4c2f2afd89dacceba2ba6299805b6d21eb334a SHA512 e469066dad4dfeaa92ee0fc12e0fb0de0eda83f503a22227b9714b282f7b8ad697726d2c69f623b5c77c9f31d3d182f4c144a660521b8865808e6260fcd5f4da
+AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63bb7cc034f54e8edf59434127e495d5878dfb761c990f9f106fbc0436513220ade66bb107030093f41c8e4777e6ccb279259aff912d06 SHA512 08f4e4473359a2633a785cd34fc3a89feaab8619843a93c5ffba0bf00e31aff2d1ce5a54aeea3eb51e63385b3480df1f196f54cdd568ff49558860460faa1c8f
+AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c264de8c8970fe4cbf5459c5ec651aecd3e3ccb7dcc95bfcc8277686133bc3187a5952edd1bc88dae11c2ddac3aa4060333b4 SHA512 ae08b08a435393bf94039edd8b74457a1d4475d8473fa450b41a993ca4ded08f79566bf2dc78144df977fe1f975e1c60b9d02b2dc4579f8c7d65839946e3de05
+AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
 AUX dblatex-0.3.7-no-inkscape-dependency.patch 595 BLAKE2B 6937bc2cebd42193c5a1414330445162b09954e80db39b3221ca6fd6ba1320bd44e41e2f896a7b11e4334dd729b4167dbfd70c5d21b55719737ce9bb93e0d8fd SHA512 69cb27f3548a55ae2d34e1b9c05f963a05e5b810e5338e7adb5f4739c03f3bd6bb650e9a6a63edfc75554b45a835c1cb596681dd3e440ea1acb0d2b661d25c6c
 AUX dblatex-path-logging.patch 537 BLAKE2B 1ed23e355e64946ac0bd8839edd26688fbbfbbd56e090470c07ffb8b2cc91ebe32500002468c1f4333adcf786722b5af8623581ae4a4ca5af53be4a5e80959c3 SHA512 04a1f26e59a7c45eed758f8e8fa1f5e1469e3ea71fa65c836d038397c0d8bbc0ca658c05697dcb32371dde33cf3d20be3f987d7b68f194f2d254071cf2836213
 AUX dblatex-setup.patch 773 BLAKE2B d32b842e52caddd1587fe2fe0a005b148bb1a231b0b4bf4cc6c62cdced6a47048639ed9b5f98bc42a72f19a8e4e9dfd1bc4bf1eff62fb032bdb52bfe396335da SHA512 c9ca96db18f81ffd999d3b2fd274d2fbf29f869d199d954fac562938a8475510278f0d3bb7cb948414f13c84c6f94dbec196c7bd04f3abe3400c3fdfe36941fb
 DIST dblatex-0.3.10.tar.bz2 1668202 BLAKE2B 2cc7e33ddc1b4732ae880d3443e65e40b16fc21fa31dfc52ef2250433f4c99bb5b590961095e044b2972b1ac9b4e38358e356b7bdcfb607d6f863720feea7cf4 SHA512 33a5ee3d23d3b9a1576be248a312ca741ea7cb629334a98fb6cb49e0f0f932334506ea934312de04ec645c86ec52699687bd2574b1802d3c23815b44c8514b7b
-DIST dblatex-0.3.7.tar.bz2 1513975 BLAKE2B de523640eacc058eaffc2e53407d6faed0969b1485110dca7669c6fb2323d4ecb91c8d73d9a8fdf3ae9d0803f5e5a371af011c0a241f97f08ae4d73ee57e7d89 SHA512 7f7111dfe7d880a93679422a43700787755ebee7f17483b4bc5a8ce55c521d7fe0baeb4890a910b9007141d63a3e3b8f50347e68001ad7c1a14916920e11a40c
+DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
 EBUILD dblatex-0.3.10-r1.ebuild 1317 BLAKE2B 6c32f1308c5c13ebcbf1729b97ac38f64d2f145753d9e2188219e61d3038834272f6bee6f13ad6afc20ee570a142b8da491eb8eba3f024261eb1c90905f21c8c SHA512 fe7458acf522c678e0be2f347f3324a2ecd65c7f1b30aaeef769cbd1d11ac6205a5d5375eb85fb7c6a3756278b4f71a4aca20896405363c95fb50333d94c1239
-EBUILD dblatex-0.3.7.ebuild 1120 BLAKE2B 1776f6e8414636dfb040fda86c7ed1a75cfe38fe80f337c57960ec6409e0e9973d7c55857609c935b96221c75f5e18190bd36e5e0d1ebb9c1ab4a018d5ced76e SHA512 ed640e2d8f4d92d3abfbe91cb6a328666fc33ffbbf9d67f72c3ca9710bff904cce7d4c6482eeccbaac6fe009591de80047c8791165846a49086ee255da3491cf
+EBUILD dblatex-0.3.11.ebuild 1625 BLAKE2B f54a627441617d481f23bbf3ca99174a48579429dd78e3b29c8a4ec0107e9cc7c4177ca3d41a9757aad964c7e0a5192ea9d6a5d9ff1538f758a0f371467f1dcb SHA512 ade4322cc7ecd1cc40193f83d5f56e9f0895199ed81d640c8df2895482b087d78406f3bcce76e44dc67f92ae0ab7875851ca96eb9b5d7ee0c7a330979292b95d
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.11.ebuild b/app-text/dblatex/dblatex-0.3.11.ebuild
new file mode 100644
index 000000000000..523c84b8f4ab
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.11.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Transform DocBook using TeX macros"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="inkscape"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-libs/kpathsea
+	dev-libs/libxslt
+	dev-libs/libxslt
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathscience
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-xetex
+	gnome-base/librsvg
+	media-gfx/imagemagick
+	media-gfx/transfig
+	inkscape? ( media-gfx/inkscape )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}py3"
+
+PATCHES=(
+	 "${FILESDIR}/${P}-path-logging.patch"
+	 "${FILESDIR}/${P}-setup.patch"
+)
+
+python_prepare_all() {
+	# Manual page is precomressed, but we will use our own compression later.
+	gunzip docs/manpage/dblatex.1.gz || die
+	# If we dont have inkscape we need to use an alternative SVG converter
+	use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
+	# We need to fix version information in the docs and some metadata
+	grep -l -I -R "0.3.11py3" | xargs -n1 sed -i -e "s/${PV}py3/${PV}/" || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# Move package documentation to a folder name containing version number
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+}
diff --git a/app-text/dblatex/dblatex-0.3.7.ebuild b/app-text/dblatex/dblatex-0.3.7.ebuild
deleted file mode 100644
index eecbe631b196..000000000000
--- a/app-text/dblatex/dblatex-0.3.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Transform DocBook using TeX macros"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://dblatex.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-RDEPEND="
-	app-text/texlive
-	dev-texlive/texlive-latexextra
-	dev-texlive/texlive-latexrecommended
-	dev-texlive/texlive-mathscience
-	dev-texlive/texlive-pictures
-	dev-texlive/texlive-xetex
-	dev-libs/libxslt
-	app-text/docbook-xml-dtd:4.5
-	gnome-base/librsvg
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	epatch "${FILESDIR}/${P}-no-inkscape-dependency.patch"
-	epatch "${FILESDIR}/${PN}-path-logging.patch"
-	epatch "${FILESDIR}/${PN}-setup.patch"
-}
-
-python_install_all() {
-	python_doscript "${S}"/scripts/dblatex
-	python_optimize
-	distutils-r1_python_install_all
-	# move package documentation to a folder name containing version number
-	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die "mv doc"
-}
diff --git a/app-text/dblatex/files/dblatex-0.3.11-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.11-no-inkscape-dependency.patch
new file mode 100644
index 000000000000..18695b52a5ee
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-no-inkscape-dependency.patch
@@ -0,0 +1,14 @@
+diff -Naur dblatex-0.3.11py3/lib/dbtexmf/core/imagedata.py dblatex-0.3.11py3-new/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.11py3/lib/dbtexmf/core/imagedata.py	2020-01-29 13:48:33.000000000 -0800
++++ dblatex-0.3.11py3-new/lib/dbtexmf/core/imagedata.py	2020-02-25 00:45:35.627054621 -0800
+@@ -181,8 +181,8 @@
+ class SvgConverter(ImageConverter):
+     def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
+         ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
+-        self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
+-                          "%(input)s"])
++        self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","%(output)s",
++                           "%(input)s"])
+ 
+ 
+ class FormatRule:
diff --git a/app-text/dblatex/files/dblatex-0.3.11-path-logging.patch b/app-text/dblatex/files/dblatex-0.3.11-path-logging.patch
new file mode 100644
index 000000000000..3d6162848fec
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-path-logging.patch
@@ -0,0 +1,15 @@
+diff -Naur dblatex-0.3.11py3/scripts/dblatex dblatex-0.3.11py3-new/scripts/dblatex
+--- dblatex-0.3.11py3/scripts/dblatex	2020-01-29 13:48:34.000000000 -0800
++++ dblatex-0.3.11py3-new/scripts/dblatex	2020-02-25 01:04:16.169346434 -0800
+@@ -1,8 +1,10 @@
+ #! /usr/bin/env python
+ import sys
+ import os
++import logging
+ 
+-package_base = os.path.join(os.path.dirname(sys.argv[0]), "..")
++logging.basicConfig()
++package_base = "/usr/share/dblatex"
+ sys.path.insert(0, os.path.realpath(os.path.join(package_base, "lib")))
+ 
+ from dbtexmf.dblatex import dblatex
diff --git a/app-text/dblatex/files/dblatex-0.3.11-setup.patch b/app-text/dblatex/files/dblatex-0.3.11-setup.patch
new file mode 100644
index 000000000000..802030118398
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.11-setup.patch
@@ -0,0 +1,47 @@
+diff -Naur dblatex-0.3.11py3/setup.py dblatex-0.3.11py3-new/setup.py
+--- dblatex-0.3.11py3/setup.py	2020-01-29 13:48:34.000000000 -0800
++++ dblatex-0.3.11py3-new/setup.py	2020-02-27 20:25:21.669297793 -0800
+@@ -26,7 +26,6 @@
+ from distutils import log
+ from subprocess import Popen, PIPE
+ sys.path.append("lib")
+-from contrib.debian.installer import DebianInstaller
+ 
+ #
+ # Build the command line script
+@@ -192,7 +191,7 @@
+         log.info("running build_doc")
+         htmldir = os.path.join("docs", "xhtml")
+         pdfdocs = glob.glob(os.path.join("docs", "[mr]*.pdf"))
+-        manpage = os.path.join("docs", "manpage", "dblatex.1.gz")
++        manpage = os.path.join("docs", "manpage", "dblatex.1")
+ 
+         # Lazy check to avoid a rebuild for nothing
+         if (not(self.force) and os.path.exists(htmldir) and len(pdfdocs) >= 2
+@@ -368,15 +367,12 @@
+                 status += "no"
+                 mis_stys.append(sty)
+             print(status)
+-            
++
+         if mis_stys:
+             raise OSError("not found: %s" % ", ".join(mis_stys))
+ 
+     def run(self):
+-        if self.install_layout == "deb":
+-            db = DebianInstaller(self)
+-        else:
+-            db = None
++        db = None
+ 
+         if not(db) and not(self.nodeps):
+             try:
+@@ -515,7 +511,7 @@
+         data_files=[('share/dblatex', ['xsl', 'latex', 'etc/schema']),
+                     ('share/doc/dblatex', pdfdocs),
+                     ('share/doc/dblatex', htmldoc),
+-                    ('share/man/man1', ['docs/manpage/dblatex.1.gz'])],
++                    ('share/man/man1', ['docs/manpage/dblatex.1'])],
+         scripts=['scripts/dblatex'],
+         cmdclass={'build': Build,
+                   'build_scripts': BuildScripts,
diff --git a/app-text/delta/Manifest b/app-text/delta/Manifest
index 88c921c96556..0b942ace0623 100644
--- a/app-text/delta/Manifest
+++ b/app-text/delta/Manifest
@@ -1,3 +1,3 @@
 DIST delta-2006.08.03.tar.gz 32804 BLAKE2B 6e070aea4e9bb4ef849fb0e193cdef08771e74bcd46219bc380f58219d05d2c73ab0738a2d611e3c2bce72a92b82276ec4b8c741f33f092dc348acb153aaa6f4 SHA512 3720f164f3721ad06bf5a73e654c70a67d6e7a56d0ce574fb0e8571b33269e56611a909f915bd0ea46434d94206a9548fd99fdef98181efe41e7fb03de75c585
-EBUILD delta-20060803-r1.ebuild 746 BLAKE2B 347187da06b711bb5c785cd46967d089f36be5449f2c896353ba6b80622c1fb863162e067b4ccf33f97d7ddc3a765b874b2a475a7853ead768224f31b8d95c78 SHA512 6e4d18e7407baff85fa8470898982a2134349e47bce8b16e6415cd86da1556bb18588792fd4e84de62ed26d1dcaa069279cfa82d025563561bda28e2fdeb220a
+EBUILD delta-20060803-r1.ebuild 744 BLAKE2B 338cc34cd34cf6fe190abc1009a0a6c35079b436d4d009d6737c40aa2019ecdcd5c024a05f6f675838634787b4139501c12b3ef9793200f609387115ecf46b49 SHA512 6f10d2eb9f997eab6b459692567afd6fe4d01f1eebec5091c13ed41ef3a5b4898579356e2ae6916c998739a7977253c6266a64c124ed9b5dca51a61373bd9c4d
 MISC metadata.xml 553 BLAKE2B 9cda4f71d8e01943e664d2802e9c048a200cb7d6b171d99cfbf42fb9578b48600506130571b030bc4ef001d2c898727f2c69330049425d84a9e74b2634c7dd92 SHA512 c85367dc67630d0879e88dbc93b73f7283f1dd526a03a7c44eaba69556d69c5c60f5b0c187daf05f05a90d6ae644c1a72ce47ab5a6fe8ec46e92a827f0f1c9b4
diff --git a/app-text/delta/delta-20060803-r1.ebuild b/app-text/delta/delta-20060803-r1.ebuild
index ef32cd107c2f..0cf566a3b3e7 100644
--- a/app-text/delta/delta-20060803-r1.ebuild
+++ b/app-text/delta/delta-20060803-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://delta.tigris.org/files/documents/3103/${STUPID_NUM}/${PN}-${MY_P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index efc0758a9174..c868375e9be7 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -8,5 +8,5 @@ AUX dictd-1.10.11-colorit-nopp-fix.patch 323 BLAKE2B e99dea0a194532be7239fab52da
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
-EBUILD dictd-1.12.1-r2.ebuild 2802 BLAKE2B 4d476c98dc2af3e88c5423ea112edaf8d8877860135ecf59dbc5b329e72480c153c914212838298295c2e0f0855962a68d85b32b79c4617ce192ea2ec8846563 SHA512 f677c4378c2524a353a7d13b9091f8a6b0ef0bd26256b891f819b03e1c5006a3e5ec5914f3094db1fc198c37b31623c20043957922dc884aad761b84d29d3456
+EBUILD dictd-1.12.1-r2.ebuild 2803 BLAKE2B 432b62db8548e23b0ee3321ad4d6d1faef7bb304eecd2c88539991ac2ed9f905632843c9e4e1936460fe13d9ffbf0d094f9db13ee8acc921767597c5eb3e3131 SHA512 e020c8ad1645e983b5d537d06974f90e33fd179dad13baf98b98711bf6df4d13c40a89897e0ec5d70514d3c38f933b9748eee6fbfd289aad5898d7ee47cc609d
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.12.1-r2.ebuild b/app-text/dictd/dictd-1.12.1-r2.ebuild
index 718e3c416c64..62f818c4f28b 100644
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild
+++ b/app-text/dictd/dictd-1.12.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 SLOT="0"
 # We install rfc so - ISOC-rfc
 LICENSE="GPL-2 ISOC-rfc"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="dbi judy minimal"
 
 # <gawk-3.1.6 makes tests fail.
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 419bb62b84f9..bf995faa81ba 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,5 @@
 DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
 DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd194a6746dd08e4782cb4b7e60cf47c44f244884fc10372fc2b052fff7d70e6c263e6f4175829d1aedbc8c2ea15c6 SHA512 b67395afed0899563e28fdd2ddd5016d4f382b6b7e46612d12853d701ba191b90771d40e1223e24e3fbf497cad01fdd2e1c67a6b2bf4f6cf082f3fbe981bd002
-EBUILD discount-2.2.4.ebuild 1820 BLAKE2B b493c33073e70bf30edc5464562d32d87c4d84fc2bbb5f6e0639bfd8ebe20e6e89d4073e3c7a624c0cff9f51b317cb42dedb27f1875bbaac6675bb047f2848b1 SHA512 15f3f7bef420c203df85e0b63ff52f70294762f181bd11d2d81feeaa21dd9ce5dbebbb76faf5888b0ec48582b63f5c9a89375562f760f54931c704d2234ab585
+EBUILD discount-2.2.4.ebuild 1821 BLAKE2B f4a6861947e64cff3200ecddbc162543df545cc6b06fb87394c6f5a64d1637c11cafea16db2417352e33600ff6e946e5250bf0feb15c29c6cea130dee72eb663 SHA512 0a73f39f35c11fb0dc7f5321ee754516db1f24e4b1c9dbf831dd9cc3be248ede956093c1b04360b11edca04f5d33f5ee45c18537cefbe3f9ff9b5ac39cafc75f
 EBUILD discount-2.2.6.ebuild 1627 BLAKE2B 68fc72328179a87d0bb4b69c97660c8604bd717b490115ded453846bb02041a2316d3b85c66adea7fe8b10aaf5132a18f90f6a5639e36c5c220bff2485c4acbe SHA512 373212d549f7dfd9197724d69895afeb5426248c8e0d06f7636e6eec74683e75328207b2bae12747afdfa2cdcad43200f4fa6a59a6d2b62228bc5b487c35a0ab
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.4.ebuild b/app-text/discount/discount-2.2.4.ebuild
index bc42dfbc6b55..d7b7fb5209f7 100644
--- a/app-text/discount/discount-2.2.4.ebuild
+++ b/app-text/discount/discount-2.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index b095fe776f73..e167b680162a 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,4 +1,4 @@
 AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
 DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
-EBUILD djvu-3.5.27-r1.ebuild 1577 BLAKE2B 3f414bc8e26c4a0a5b5289c6d7d46036addecdbfdd93f291f2c9d53f289039b575b25fb33bbbecc3101a0e02759227632bf59e7b22b31d498f4021af888d9d60 SHA512 2863c935f78a1de5b756d711aafdedc7148f40c5f4e61c729f143194db19999619cb712c34e06301212cd84ed93ecea037816be25ef52194c3da1de14740a1a0
+EBUILD djvu-3.5.27-r1.ebuild 1574 BLAKE2B aa47ac7501b211d0f56a90cd4d82f33d287cb575216c78f27603d7d81a7b585637ee02ba81c5e9a918421dabac9d23f338a60bec5377821ed35f750140568481 SHA512 9bcc71de91a7cb092b635fb9b6456966faa03ef25154f145307da888fb219c419e6907517280c0dc85673de5b9d7914829d3ebf505f2333156e859ac9a0bbeb1
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27-r1.ebuild b/app-text/djvu/djvu-3.5.27-r1.ebuild
index c4490945b7cc..607b51c18958 100644
--- a/app-text/djvu/djvu-3.5.27-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 PATCHES=( "${FILESDIR}"/fix-CVE-2019-18804.patch )
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 3e32301f1adc..29f27405778e 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2476 BLAKE2B 2f9ab1271859558ab85ef7d6d7b217b19323a786eb004ccf3a48835ae1ab4aae5bf493d39b75e1bdb192944b7282db3dd3921903e6d70ad9ff5d014489eff8d6 SHA512 f576a8fe4855efe5565a7c4dba6ff95dc613f187afe7162697fabb43a1ee2620b8d11de86200900c1365124d6fb34f13fbcbac6dfa0803a552fd0503a91dc347
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2474 BLAKE2B 3c7386e7d7b2101553bcd927aec8c2a7f7b3821efc437c71a415a734a778e2dede5d85fcb8cca5e07e66e5a9d1401f642c7da77f1c6521e0091caaeb2cfe6346 SHA512 bb88dc3902be88a7b0a579bde0287db59ae2091235529c73504ee6027f204b4bd217b317f153fee86d6b06ae786d3ccb8e16166bb5ccf2ccaa4b8e05dac76b3a
 MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index 6b19112deecb..b271adb314e7 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index e3b129a4346b..29e2fa5bf21e 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,12 +14,12 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1243 BLAKE2B 48c52bcac31f103ab5a3c408bfc3305e348212af5771c8d700d0e2cbdd8c55fd58dd1067f1fe891868cf8252253609806f421d2b7dedbaca823530aa4ba3b159 SHA512 002f44b85c5b7db9121a4b23211ddb1fa08998c1218bbe75b256ceaa1dbce162247f9391c6adcfb165fe8415a26d5fa8dd3c0f9a0ac11bae51ab1d7b5c20cdcc
-EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1243 BLAKE2B 48c52bcac31f103ab5a3c408bfc3305e348212af5771c8d700d0e2cbdd8c55fd58dd1067f1fe891868cf8252253609806f421d2b7dedbaca823530aa4ba3b159 SHA512 002f44b85c5b7db9121a4b23211ddb1fa08998c1218bbe75b256ceaa1dbce162247f9391c6adcfb165fe8415a26d5fa8dd3c0f9a0ac11bae51ab1d7b5c20cdcc
-EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1243 BLAKE2B 48c52bcac31f103ab5a3c408bfc3305e348212af5771c8d700d0e2cbdd8c55fd58dd1067f1fe891868cf8252253609806f421d2b7dedbaca823530aa4ba3b159 SHA512 002f44b85c5b7db9121a4b23211ddb1fa08998c1218bbe75b256ceaa1dbce162247f9391c6adcfb165fe8415a26d5fa8dd3c0f9a0ac11bae51ab1d7b5c20cdcc
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1243 BLAKE2B 48c52bcac31f103ab5a3c408bfc3305e348212af5771c8d700d0e2cbdd8c55fd58dd1067f1fe891868cf8252253609806f421d2b7dedbaca823530aa4ba3b159 SHA512 002f44b85c5b7db9121a4b23211ddb1fa08998c1218bbe75b256ceaa1dbce162247f9391c6adcfb165fe8415a26d5fa8dd3c0f9a0ac11bae51ab1d7b5c20cdcc
-EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1254 BLAKE2B 92cc562ca91cf2c0b097933993515857413636127e471dc5f9fb93cc0b7e60dca7a37ae70ec33a68d1cd4479e7b4727f55638b4d391e3f878ba8996335bc3326 SHA512 3e5b5751a08569edb7c0379f1c3faf5563d76d90157412a201999eb63796e74a97e8a4fa8c95c9e563108d9a20421cca3af59fffb11e7d1de9dfd383a1105582
-EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1239 BLAKE2B 272e469c569ad2a5615ef082a882bb9762917ed2115f713484f0f238c437ff28b35b733716e07885ecc4bbd4a21f64f2e81d84c83469cafdac20a58f1199415e SHA512 77598fa06022294040611b4a8e64f32023c26bd9fc4b221461d7d8991c32611eee3989898d2119c934153a08fb681b67ddfc462baec4046d6d5dddd8cbec766a
-EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1239 BLAKE2B 79d3f2214e853f27a45b4179e04f58d8c0d4954c41703195a06332993fda36c0d4d20f63011619c5080392b42821aa2d694305e3bce23f4fdc47b3bc064e843d SHA512 024cfc7fedcc461d65d87279b4893052a36d9e85d4034fa5807768227385558c01ccb50f4206db5d6b5dc8a72cbe05ecda3dcc0f330f4132656e748a163b04eb
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1235 BLAKE2B 8a650425510dddb5678640e01d2e66be2a11df865cfd38256b88a59cbb6d44f28084eb93940e8e72b8d852b196cd81516b7075a04cf031ae7fa09247516d78a3 SHA512 479843c7bf7044204e9d35e643786002d6b8080c01092def97c49d7181275858c123aafb87dfa6b9785fbe7b77e044e0088b90799cfa52948de89ad5a4f81314
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1241 BLAKE2B eca9b33e2d713283f55e9988f3054ade3a7bacdc8a68cf7bb951001b6b30ec1b626f3e4ff715fd5d2e801721ba6c6cb5bb3266fbfad90c236745643f33170e58 SHA512 467b9192bfa9f7ed4f42b509ef265309b17bdaf1c85637a3c1bd00fbd4395455b6304f47d21a846774f1517ec676fb2404dabb525380f8a05f4191f15701f576
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1241 BLAKE2B eca9b33e2d713283f55e9988f3054ade3a7bacdc8a68cf7bb951001b6b30ec1b626f3e4ff715fd5d2e801721ba6c6cb5bb3266fbfad90c236745643f33170e58 SHA512 467b9192bfa9f7ed4f42b509ef265309b17bdaf1c85637a3c1bd00fbd4395455b6304f47d21a846774f1517ec676fb2404dabb525380f8a05f4191f15701f576
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1241 BLAKE2B eca9b33e2d713283f55e9988f3054ade3a7bacdc8a68cf7bb951001b6b30ec1b626f3e4ff715fd5d2e801721ba6c6cb5bb3266fbfad90c236745643f33170e58 SHA512 467b9192bfa9f7ed4f42b509ef265309b17bdaf1c85637a3c1bd00fbd4395455b6304f47d21a846774f1517ec676fb2404dabb525380f8a05f4191f15701f576
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1241 BLAKE2B eca9b33e2d713283f55e9988f3054ade3a7bacdc8a68cf7bb951001b6b30ec1b626f3e4ff715fd5d2e801721ba6c6cb5bb3266fbfad90c236745643f33170e58 SHA512 467b9192bfa9f7ed4f42b509ef265309b17bdaf1c85637a3c1bd00fbd4395455b6304f47d21a846774f1517ec676fb2404dabb525380f8a05f4191f15701f576
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1252 BLAKE2B 8f5e11883ed2f5d2a95fab5d296030a2816ed677fce0925508d3e17ee484028e17d8e6ab9ac03db338fdcbf65ecb97ae785622493f817ba0e01b6a1b33704012 SHA512 a56ce0e6e36c5f190c203bb6fe0344ca7b6f68158c45da6e6497f4b6ec0962d8d7b5d83a67025944010456f93f5c9f2588e169247f76e3f139c769f04e104d8f
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1237 BLAKE2B d4d562bb7f343a834fae23eafb23629e2a0486036799c2a1a1290ea4016ef31a6f391a23e41355016829f51820751f9c89bd8efab38b1ed4e37e172b12404603 SHA512 bbc98e51de6d367709a5f22a3f4fbb2ddf75749e8886675f1b4e6a0198ccd3639d869de43c864b577d74b4b01d9ab50014a6c8ac57d83516f1c0bc474635588f
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1237 BLAKE2B f8cb66da9d8053ba8762882a1c68e89789028491ff867bdbd4414cca5ab415098bda61b7a4d37ccfe37d19326d9bc84c9347799bcd896d636f1243d10b171151 SHA512 e06d59cc3107e5bf4ffa1422029092950aa79f7ac2abb7a330f6bcbd9aea2eb78eb7e6ae33a29a561fec39ab8842884938234c5b02bd937dae83f182e340e7f1
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1233 BLAKE2B 4b4a21e3abd3f349ba4bac54bce466a56ad958fa2fb2d9944ce1b234947bfbfbca1b8283e4733d68914dbb20ffccf5a043eb0383e2ba2a250603d4c186de476a SHA512 c3378882518d6b4806562bce0952e512b778c0321a9a9ccbb145a683c7f66c5a99a5f852080bfaad949cafa12e6dc79c2a551a92c01e7ca2fb29bbccf44442b6
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
index b69fa8f0543a..3899c70774ac 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index b69fa8f0543a..3899c70774ac 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
index b69fa8f0543a..3899c70774ac 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index b69fa8f0543a..3899c70774ac 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
index 32c3117aed47..d50dbda46b60 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
index 0def1fedbbe3..19eb7dd6ddbe 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
index 145ec104e964..26a602efef98 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index 975af302d342..e8a92e1e93cc 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index ac457abdc927..9c1af7d2c953 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,5 +2,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1831 BLAKE2B 0abc8ee891439aeb609922e9c38786496868a38bae790fac8375d632a42bcd4aaae9102efb9174d32c42d3992ff6b2c61460f38583b45ff4bdd0429443295cd1 SHA512 030e561cf8f2ab2ee43dfa27c4f7b54adc89416be3015469c9a80c6fe1d3113e0a23dfeb1c451b87795606eb5f14c1e001d49a1a0ec780a50259bc5124f8c43c
+EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1829 BLAKE2B 31a9d34677049071942b618884dd97dc1678a3bd71ca529c7539fe4fb5372ae2aa408acdd24813d0285fd383f130812e7f02f281eaf60fb8152dde147c78d964 SHA512 f273e9cdcc083ff0229f81b4445d841042e483033d14fe1f048be55bd665233993a100096742978be4082158a2a3fd49872f89ca6c75da964c6fd451befd9d44
 MISC metadata.xml 409 BLAKE2B 326a67b502158f75dcbbd01ef2772bbab0099a4d4a1fc1e7463655abbcd807fbec8761edfd1d312b4d3c845d72506fbf53245779e657cc0baf7d2fa44b3e147b SHA512 abc9fadc1fe1a7a863308a566932f958df7b13800336db521acdb6cc93773fa6c8310a34d702bb996baff5718c2329ef790bedacc5f1d849810c174fd8b281ea
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
index 70f4774fcfe6..d71587ba1d83 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index cf1f72eb826c..8d954baee898 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1619 BLAKE2B 4012186d3cfc663907c9802fbf7a7d2bb64d3ef484d9a237af20856f29b6a183676fb5323c3f154891783c620f19588f53e38621a3b058ea54525a802e14ee34 SHA512 0f26c69d9e5d7f54710211761b661e9d06a1c28ad18aa182a6884bacb256785d59bb53ba047981995cbfa956ea8e891f71aac9c14f3a64881eed28a5e998d0c8
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1613 BLAKE2B f7da529a2b0d3d8cd0e112a6737e56fd92fd3f4d95f9702cc51a8b4629e1217126852bfcbb4375cc8038778249b60847884f6567e8a028de146fcb34935b1592 SHA512 51c03c6adac381c511f536026cebd18dd4d0af47453130b7ec60ffbd1699abc0fd5ec9d17964fc29bc723ab62d14db6bad6ca9744b8156b3c867029aac22f6d6
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1613 BLAKE2B f7da529a2b0d3d8cd0e112a6737e56fd92fd3f4d95f9702cc51a8b4629e1217126852bfcbb4375cc8038778249b60847884f6567e8a028de146fcb34935b1592 SHA512 51c03c6adac381c511f536026cebd18dd4d0af47453130b7ec60ffbd1699abc0fd5ec9d17964fc29bc723ab62d14db6bad6ca9744b8156b3c867029aac22f6d6
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1646 BLAKE2B 187d2e251066976786ba3ae66116fa383d0d895239f5fcd536b138198b26b1f47f6dd04670fae17d87fee0c6d1918e040d9d588daf52fc37c016724af44f10d0 SHA512 6bbd9eb20dce894d2bdcefc04a85873fb2cf5819519cb3b67c74a34f2c17932f0eb1917562bf1c480b38ac9977b21ccb40a8c42759f2b387bffab88de111cd40
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1646 BLAKE2B 187d2e251066976786ba3ae66116fa383d0d895239f5fcd536b138198b26b1f47f6dd04670fae17d87fee0c6d1918e040d9d588daf52fc37c016724af44f10d0 SHA512 6bbd9eb20dce894d2bdcefc04a85873fb2cf5819519cb3b67c74a34f2c17932f0eb1917562bf1c480b38ac9977b21ccb40a8c42759f2b387bffab88de111cd40
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1617 BLAKE2B 9fcebbb5464566086d706fb814ec0ec3026e9408d1663c1e774cac4da7876230b0594507bf934c9f91b5caf96ddb70b236b4a802982ad2cc80c3fb9ef1890f1e SHA512 91e0fb0575836ec8078aeef44b7df472e944d3b79f2e78e2fe7f9fff67b9c9d1e58c50053b1775a64ed2e931582907623f1fd327f546907f76d217a7d0340912
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1611 BLAKE2B e0fedaecf8afa840b9ee59ffda54bc0197a9ec2d301af01c7558b76884cf655bb07c194b45c4cdc542bc9995afc2e47f267cba7d7564c6e77d08deae7368fba1 SHA512 be048919ecfe90c7f6d965be03d6b8e7b4ec8c3b2aa2ead76812f854bfbfad59f6c0d9fa8aa81f1638d01b7ffb21759c5798efcbc6057986b58ea88cc95bb188
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1611 BLAKE2B e0fedaecf8afa840b9ee59ffda54bc0197a9ec2d301af01c7558b76884cf655bb07c194b45c4cdc542bc9995afc2e47f267cba7d7564c6e77d08deae7368fba1 SHA512 be048919ecfe90c7f6d965be03d6b8e7b4ec8c3b2aa2ead76812f854bfbfad59f6c0d9fa8aa81f1638d01b7ffb21759c5798efcbc6057986b58ea88cc95bb188
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1644 BLAKE2B 6826d321b422609a8fbf2a0a288fd430c754518625547a34215356dbb592be5ebc0ad138e5933ddfa9046a0d6e513c85f5fc6213d30cd268e533be858665bc85 SHA512 92b3d8ba28f78e917580f07ca581c58cbfe01b052fa0f9f9fec061a709592520fc969ed86fe2d84f90e46cd4362550c972615731e1cbc2f5266c0e5c0a71ca3f
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1644 BLAKE2B 6826d321b422609a8fbf2a0a288fd430c754518625547a34215356dbb592be5ebc0ad138e5933ddfa9046a0d6e513c85f5fc6213d30cd268e533be858665bc85 SHA512 92b3d8ba28f78e917580f07ca581c58cbfe01b052fa0f9f9fec061a709592520fc969ed86fe2d84f90e46cd4362550c972615731e1cbc2f5266c0e5c0a71ca3f
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index 101f0126aebb..43af0cfd76dd 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index efe0a9420bc0..3e0f079b6ff3 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index efe0a9420bc0..3e0f079b6ff3 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index bd9de69531cf..e7905b0f9208 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index bd9de69531cf..e7905b0f9208 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index 7e0ab5f6e850..0d8b5ed767b2 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,7 +4,7 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf142
 DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
-EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1324 BLAKE2B 7621c11211899321d079cbb82ee4c2ef2985273926775cde9307ac513092c38bdbf68affc756f88e3ddd0bc962a99e8c1900da6c36064ada2df17cc12642d75a SHA512 c1e179c9305dc294da034f817dce467a1d567285aebb06ac22016b5e7a6d5018fa3035fa50ba63fdb80cdede3f31069b0f23c0085cd3884b5c93800bbc68dd1d
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1354 BLAKE2B d00fab716b3f97f4f57532ba891cb8b5717b6e8f51cd1e963a9ffde84d24e4593d9d28fd449e45b2466067235962b3fd3c44883ec6e6e2bb9404f62966c83484 SHA512 0127d18fe5288018c17f6194d44d0c0cf21735ade86c9b5d04fb4da82fbcfe2431b16d913b2fab08e88ae3572141f786c77e15ec15d35bf4cecd9bc67c84647c
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1342 BLAKE2B a97bc506d7b2d93d032e3d742dc82df094c793bb75d0a2dbcd812d68cafc81c9ba74aab46dadf79e27b2d10200c8b1909dadd2ce0ecf51493ced9b629f6b1c27 SHA512 3b6ec4bf42d6523fa29fd696f5a3dd2054dd065997c4a07f61bb15bf3813391cc5f226813ca49c0cda04621a332181679d4f5e1204ae893d53deb1dbda6d9afd
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1322 BLAKE2B 06eeadb5c505914110ce1f53d83a9dfded8cb5a7b59af0139c28346b5e58df439fbfe4133fbab74078002c9be465a2d3be9057aa2a67cbee0e7e0b2fd0da4605 SHA512 d714b255bd0137d266c95cb68477d3c01b66ac46a58415c1dc99f39aea15df8ccb158b9a3b25d9773d24ae1f4b903d5206e7fecd15340f10eefbe3892455c9c3
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1352 BLAKE2B d24f440957440b86ac6e193c68796a0ba0d3c9ec6ea3281983e158bed63d6c004318f5181b8807e40db1d45cfd2fd4a5191ac0e445eaf9168a699c11c9347cc9 SHA512 61e26abb2d6e5fde029d4c2d1e859972abe0e98e345b9294a0073d33e0b5d7d30ab78e4fd13f96202ec99ae28db424f7059d35c126b6d52e0e3ea0bb255e5631
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1340 BLAKE2B 88fc04015aa5074f18ac126703fcbbdf8bc3bd15ef071ed0f305a3aad27b9bc69fe3a56fcd4f80fc946aeae719ae22b56ba5ebe2d8d3f81e094214bdb2eeee54 SHA512 fd892210082226dd51ef24c5238bf5fb3b6b3d35e72f818825d71f039599426408c2c1f937b83ad0735771218cbd430c15c8405e83d2cf83bc38196bd69e3192
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index a0b73766c560..f8ecd6065046 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index 876ddef8cab3..ae371b555bf7 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index 2ae5c4676916..857124d8ede4 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 39d13474384a..c3caae9df5fc 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
-EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1636 BLAKE2B 861788ae48ef507a5901f77972508cae794bd3e177df7f11084718c20cf95501a0458d914665c801c4eedaf9a6596b277ecc9b604671c82ddd1339f0cbad760a SHA512 91c940cc4cf1e38d386c20de5fa7b7c9c2e3d497df0a8cc7c0e38b15c2dab6c0668c67b6829de59f9f33e42709e1a45ba14f10b1948610a1c5d8458abedd28b8
+EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1634 BLAKE2B 857f1c48c03645ea1c750e3b093f7f3bdb88e852540d4fcf091c16510ac3e0f3d30f0011776e4f3cd1708aed13639c0311357c15b6ebf56ff2d42e781296e9c1 SHA512 307ec97e9c0896a8e9a1692277d94fda0aff720507f6569dee3b3b773196f436ff1c2df69e6dde52ab0b110503ab51d2062f8013d723eb283826a0318e44c629
 MISC metadata.xml 411 BLAKE2B d10acaa19dc1518378813204f8afa18a97c88647b8cb6cdfa0e214935b999ee17aca34e6c3ecabfbaefabfa6ea229eaaa4c2a6ebf877888e32e6ef1351f5fad8 SHA512 55962cd28fad52f6dc931791e3e2288e22e183e3d49183e0f9ff890d23a38d6ad928eed4ce0b4e41b4f381234536ff67c219e4c8a75efd32cc0a14eefee6e299
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
index 9200c3ffbfeb..67a71db9fc8d 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 1150b7565b64..8fc2c8140934 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2156 BLAKE2B b45cdda71d3e8115230bd5b53f563d97b1df51a3ffbf47e6ef8f3e1ccc2d2bd622a8fde0cfc3de23cb4789f025ea0f45cc0fe8e819a00bf7226904d3c7e47fc4 SHA512 cd68f1e4e2d6d92ec43f4ccb0d53a0f43ee3e24491d5dc6eaba914a391b88e6a5e8d3a09ef4cd54839c17a91441a4409c72bece1b834e543c7805ea366f68b61
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2154 BLAKE2B 0d25f6d9a43294002ee95ba4f4aec83e1bc959c035b27d628d44750c11c06d31086ce00827ca528087737141c6f97e6b80cdecbdb1e0d145c95afcb4b5b9152f SHA512 97144a5df36f594fbeb12405e4ad788b70d49f7f614f746143f57163745f34abe89b09a62d69ba52ae46fdc7fd0b024c72d85caac9d655bf3276466ae52fc1b1
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index a40eea364f2e..41555d62f174 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND="
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index acd380f65ed4..b6fe85045704 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c6
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1574 BLAKE2B f049868ef3cdeb05c590898d9586fdb6d73b9a006e56f8bb5ede5aa9e9cc6b3b1df7222f0d546503cd14a3637c5b45b7cde1c3553520b5ed06e69a9bbb77046a SHA512 9a783cc513481974f50aa43a38f1c8de6d836088b662767e642a409446c1dcbea934cbf379eaeb0bb175776931102a82bb150155e0252155b78bf6b56237a8b1
+EBUILD docbook2X-0.8.8-r4.ebuild 1572 BLAKE2B 5ae9269816ee805d8aa8da09f9f024c8e7cd0bd20c70d4994a17066ca27f6895a1594757e44a09dc4b0251082554a7b6e5aa206ecd0a9c2e4d42912d193cbcac SHA512 9f9a4553439927685d07b5f117fa20d5ab825bfd69663025d94b1ee482edb2a033746f7a49b36410c880bd1eb94d0654a75e7db373caf5a101f5b843858d9aec
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index bed4292f597d..261929e07dfb 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 0999131839bd..b3337deb95d2 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,7 @@
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955fffd7ae1435725014d52ba716626e7891911afe11674beec11fa62a12983c8dfc28cff682ca0c3e798449a9b0f SHA512 81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4
 DIST dos2unix-7.4.2-beta1.tar.gz 712261 BLAKE2B 020b51a53b3b8ac601efd0f3fa424fbe5a42ca5b06e1f7282c2aca021e22b38aac21e4aa7b42ed428c95053d57bb5c35483881b06dc580b533eac2fe716142a2 SHA512 323c0dd90616bca1891f8228d43bca1c6415b5765f5fba4ccf5ce692da9b545c8f10f908ba5ebd65c3409fb4d9fdaaa2fb36d589faa8b5940d27ecf8f72bc422
-EBUILD dos2unix-7.3.5.ebuild 2063 BLAKE2B b5bec790b0413f7d163eaadbbeb718259519f179e6449fac77466a749b80969932e5571512b9192124fde103faca2601b6f287cf5a5aaeefd047dcc298f32efc SHA512 665e7243e49ff73ce70d1ed1aabcc5646592230da51f8c00131d62af460e8a1bd7b5b67d449bdfb1a1e6005d9ec14522ba46b98f1450bd8c155ec0f3f9caa5e0
-EBUILD dos2unix-7.4.1.ebuild 2084 BLAKE2B 34ea0687dd9b62819ea07dc4d217950f395e69ab6f152971e69115e6fb0524448fd7aa20a83a09a80b24b2de58850a684d26e30cfebb97c7c13cee4d34f76713 SHA512 fe58262dd2b1a27d3327f7a2fe40c8f9d8b59e84677a494f632f67bdffc68c9a4ddacb237c4f0144f8b1774aa53d4ba04e61d8138c43ed74829ea9db6a5036f0
-EBUILD dos2unix-7.4.2_beta1.ebuild 2147 BLAKE2B cb95b8e2e6ff0138adb3d296d7b78af682ed71e5f80d1c985322144c2af0b63cbe3f2ce3dbfce76332c1d220250d3c853031db5a3343de9699b11303b5df6b61 SHA512 b8bca370d4b1127382a4b80ca87ed8aaafded29da6cbebcbd77db16855cba7fa3809010e7f7687b51bdac1d6f6722481e844496b71fab191f8b3f68ccffd8a37
+EBUILD dos2unix-7.3.5.ebuild 2060 BLAKE2B 79addcc1d203a536003d9ac775c520f09a3f816898e1c888e5d3305500db1a18439d9503f365e91e2c5379456101c1e090926191d09f67d5eae00c6cd632f418 SHA512 c486b0abc3b9ca00bd4fc0909298ad4340d6b84e949ffe7f61ac2e0c05a9aa47b83a72616d1b53f867f2b51ec04dd44467f988311cd9a11e031ba2e4a4ed1936
+EBUILD dos2unix-7.4.1.ebuild 2080 BLAKE2B 4ee1a14eabb90520cdfb6a163d2bc04f2c3aa7632914e47efc8d5c77e974d2590d422eab6e59cae6e4ce0ecd0723721a640797b8a5b6390a2041cec6f7919cf3 SHA512 71a45fdfd99e9e0ac65b12f81e7f7ff5d15608f82521f24a5bdc17bf439237aa6546e0bdfa8dc6a5e00b3c02344d14f43ea1ab5dbf219c8221b988e1e87f941b
+EBUILD dos2unix-7.4.2_beta1.ebuild 2143 BLAKE2B 053aa58e57e7c752e0f23db32bc0b4dc0f7d56ed152f9c2d2b0760c9b1b1a37683355bf160b794b5371a54be302238c20939ee45be81d221f6ed4502bb40bcea SHA512 92c0bac78e01a5896b70f3c8199e3f16165b912eaf3388dacf3bcf42bd7cb6e0de77f59c687058ab0cdaa588ce8350c3df77e59bd2b211bb160a8a3b271365cb
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index aa1c956e98e2..4c44884af4dc 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.1.ebuild b/app-text/dos2unix/dos2unix-7.4.1.ebuild
index d57d4c02b286..74ad112aa731 100644
--- a/app-text/dos2unix/dos2unix-7.4.1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild b/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
index 6338a7ec3811..21a971f34cee 100644
--- a/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 69d110c2c6e8..1989ff76d87f 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,4 +1,4 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1299 BLAKE2B 71ac46c013dc07e3ee421ebc2131af4f31779918a3a1e5c02dbb0fbbf3f41a73a20c8ac70dd1fe24950d019c438314fdba78202204f8b0a97a0aeaf48b33e18c SHA512 dfa025a11f3c746fe776b457712f87b3aa345c88d190b10a98a0ee8ac437bebbf3db81ab261fea469fdf1c5dfe86d0334bdfcf2e1fe3018dc1d686633c0b8903
+EBUILD dvipng-1.15-r1.ebuild 1296 BLAKE2B 50bb4592f8ee749252bda8785b52834bdbd28d9c25e4455a919472310e57c4e3617d7f8b5a7db8df21dcde2a86b9452dfbadf38c165d482ad6020eed2af8547c SHA512 9e89d5e1773cb593936064fdb02b59edd917c74b54f9941a7d9ac3d698d35d27690dd6cd6956b07fafff27d6cdc18b88da4808c4517b811b2c7304d4ca466189
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index a920fd418f39..f3a16d4a27ab 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 43b218993c95..c1de7706052a 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-module-dvips-2019.tar.xz 34492 BLAKE2B fcc7ae96fd1fc87a4e4164e61c611587ddebf628c156d798df819fc9e2fda2c23e70bf2e7eddd779275fbf9b223ed0e7092d5e0c82144d8dedc70c8a7b7a1136 SHA512 ee10b8c1b67997d1c781fe2c3e5ce7826c111a2b6f4078330b566bf5525ad2a1cb2b89c4efa8d877ae1557fb319941ed09db30b229a62b6d3ff6f6a784e48df5
 DIST texlive-module-dvips.doc-2019.tar.xz 514068 BLAKE2B 91e4717b49f7c3b3cc0b350d9b5d029dfb6dacfba7a0d0f95195e681bf55e86c18f666d9a0a72ea3a5ca6cf4ad85e91e3faf2febaac3878b3e6b2d8138097d54 SHA512 fcc91e88fd3536244d878458a90d31ad3b9ec9efbc08d09d8b23f13d3887ca575e17663b2e21451abf88de389f7fc3937ce3ab49bc9e6ea94ab77c66ba179a00
-EBUILD dvipsk-5.999_p20190410.ebuild 1498 BLAKE2B b5d4116a57790ce62391e9a98f1ac08b410e45af184e902cc82f48b17017a2ce96791e8a41c5bfc9ab3a9b78923cc827f2933caaed6720d67e224b2525b9467c SHA512 d49bd3c59ab5006131ff6a575bbc868715acdd60492bf48d2e5f94e6d6fae059af60a9ee8733988b7f54c1bb66337448ffebd44b65b483e88b55741648ee6449
+EBUILD dvipsk-5.999_p20190410.ebuild 1495 BLAKE2B b46d16186512996d001bf32c3695da34902f07944897e9526d10e476c5a7fb7f6b085bbaac8557412e7811c653397f34c1921f62974fe6f0815ea81859ac252b SHA512 ed59e4c3bfdf71cd2856eb21dee9bdd865188edebd895e8404b9e7927561c34f9636854cb7272180e2c358d05c8d4378d1967528e8a9f45ebba0f210cc7cec0c
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
index 9858e39f8607..d4c651b29221 100644
--- a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
+++ b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 3c7fa2f09690..4a6e9ad67c32 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,7 +1,7 @@
 DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
 DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
 DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
-EBUILD dvisvgm-2.1.3.ebuild 1112 BLAKE2B 6135fe8a3388472fa94b1344ee6097cf977f512cf875172f37c2a81b2a4a36a670668bde47ee00c62f2e944a58c1af65d9c08a73eaa0b176155f52d03e83ffe5 SHA512 d2e51492b603e5e551edba02e4ddaab16c89c9646b54d422d6495f5e5203b4046461cb58e6b772371a5ad51e947deb3304224cad441e7d522e2c43cac5f447ae
-EBUILD dvisvgm-2.6.1.ebuild 1202 BLAKE2B 9571be4ce3544239c0206b459204066b595465b33ae0b5c1fb8c7dcf9f3d805232952d705b2197b4429fb511f55227d73b366fbd69688e5c05284440a93f09b5 SHA512 cf6e91c827a2f15634563da4d6f6536771eb26190b8e11bb93833468822fc0b348d420bba4655755e29076527fed66ac746fb119aedd42429fcdd3f60c60d061
-EBUILD dvisvgm-2.7.ebuild 1202 BLAKE2B 1c287a4cea343470f1df3ad65eefd20a3d722dcc092eda19087965ae54a59541984fcf640ca9d3af7e4b8ce9538883a3ec6258f43d28ee305931ce7c1726ab12 SHA512 206dade91b836bdeedf36e0d6e4923842060f05c4cc693d176593bbd6318f2ac514cc762cf64fdcd23d63135ddba873b70a6367e98e2d0cecb21eea90be6d476
+EBUILD dvisvgm-2.1.3.ebuild 1109 BLAKE2B 62a43b55ec7b13d22d21255c88118f792f23991c41a930b804556ad470b9ea74ca87a745d60dd35dc3eea59f3f45c5ac1429781c86165afcc8dbcfb0eb588d18 SHA512 4096471c087bfc8a913af3722f09e7d53da761e7e8b80dc4c494adea9871147791dc543ea782974ba552ffb8c4929239ea17d6ef3dd4b2b2a77a87a0cc6dfeb5
+EBUILD dvisvgm-2.6.1.ebuild 1198 BLAKE2B 43104499f16347592d7b328e575cb528605c852154ee0c9fe7ad468b0cb988347c397d56700ab91ec8404b239a1002ebadb1ed6abbd8aef316892b755a63fb2a SHA512 5a0504d8953c91c552e5c688640400aa16fb11e9add8a6af9a178c44bbe87c7cbe9e0d966f02b47d5d282ec72d738b1617c1e77786f1bc92527762051ba5bd59
+EBUILD dvisvgm-2.7.ebuild 1198 BLAKE2B 7e60b8ea517403fd22f033ed0b3beb8e2adee9a88c575daea688de33088714b4066240e5b764922ccb558b20793bd6d853912325927436fb2afe1e28a0a977db SHA512 7fc67c1d09859469969977d9bcc092267a8970539bd9c6f1d991776de25962138cd74285c5add62f81b443c30fd0f12ff5fdf0ee320d885f5218e377fc0ce693
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
index 8a726d9a21dd..b4d1be54a80f 100644
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
index 72b86f9d9eb3..72a976d24bc5 100644
--- a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/dvisvgm/dvisvgm-2.7.ebuild b/app-text/dvisvgm/dvisvgm-2.7.ebuild
index f127b1931346..043fe1d0dbe0 100644
--- a/app-text/dvisvgm/dvisvgm-2.7.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index 493c87e69983..862a372c4e3e 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -2,6 +2,6 @@ DIST editorconfig-core-c-0.12.1.tar.gz 65369 BLAKE2B 30296b64bd215a8b51d3b4d6146
 DIST editorconfig-core-c-0.12.2.tar.gz 67002 BLAKE2B 6b808366acc8d0a96fc47cb74d620a4028978d7114b4a64d6799527276442f1d39ba8d5611530f873c78b7c49893c5edecec84dcc6f2616ba2663cb36fa92d0d SHA512 6ab3e4f7f95c83c0781064ca15bb70394bb947f9d4cd1348224f02e25c65021d14439b913775d7cfafb93476158799c34438fa548adf3c7ec6dbfd6f1052a046
 DIST editorconfig-core-c-0.12.3.tar.gz 67701 BLAKE2B d5e6310f770099f542eb81f4ca7ec975e74c49f481c4e8e07832a7f9fc0882e2cb65da5b4b18ad926786d7ac92c3deb6ac0a547188bd68d350143258796ad1b8 SHA512 4a17cd6317bd45f8b0131070165d852569d020f1cf74e72b44057b97672184b4992aee54aae6e3222c669fdce8bb6b1f3482235e6518acffcef05e1d74087e6e
 EBUILD editorconfig-core-c-0.12.1.ebuild 901 BLAKE2B 541ba2ea83d46ae92146d81fc61f33c28135596ada38f0eca29a8a8e4bf556cd8ccd640cb8c346e2e0df799bc821cd9649d96d4e6800019d4540bfc58cf973f3 SHA512 84b2b7388a7df7ac9d7de0d3ba136d513bc005f729ca833d9f2dcb1ee06087d3935c37b82ac2e85184500b157c08b014e1432eff4f09449f3d20e21efc6cd98d
-EBUILD editorconfig-core-c-0.12.2.ebuild 909 BLAKE2B 9290ce0880026595276b999c28029e7b29a50e03e6341be6c01c923bf0706594c28bca7b642d55afd4cab7acc99b2bafb02774ac3edee46ccde6995f468f94de SHA512 09996bc585c98bfab81df6a76d024d550e84e1e1e8c045e5f8a1235cfb54ac1ca67ca41eb1984da446bdf138c2775b49200f87129df2ae1c52a4ca9190a909b1
+EBUILD editorconfig-core-c-0.12.2.ebuild 908 BLAKE2B 4e06c5be8aec27b1d41da5854e34385c1dbfece7cb9a8f1a33c7e694bcf056f32f957b641a430c9a6bd1299da1e364090c566c8d939a3fdd82b38e8a3b77b8e0 SHA512 457bac4c77fee133a9af5c4aa65d5312dffd5dd52a000e5965fd0117845545d7ce482ef1d7473d2e3d8cca40b0e5a9957a8fd6dca455bc4d84ee62a86bab6adb
 EBUILD editorconfig-core-c-0.12.3.ebuild 1023 BLAKE2B 137e85dc9b8755ee15fc24f65a153e17db8ca153120979b6810b94256b15a99f03e360ccc28a95058b0e7e9d1458e643f136e78a139f3a24f19ecaca90d85eb6 SHA512 9140af3b2e1d1b5f12d78c37ac38c3f79143a9bbc0cbdcaa04ec690fe1beebb346fbc58a22a15def09896662eaee2a1604c566b58ddaa37a30f60e1a03b4d2b7
 MISC metadata.xml 388 BLAKE2B d2a5f28be0aea3f3aefd1b8e82e337b87e67192b96bea1e2e0e5073e44f8c54d3f0380a089118d405c417d42ee6d978919dc8e0212a36ee0d3808b706846ad70 SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
index 1e1564aa1b52..ff9112b620b7 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="cli doc"
 CDEPEND="dev-libs/libpcre:="
 DEPEND="${CDEPEND}
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 6081a0a06876..6e156fa55ff0 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,6 +1,8 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.2.7.tar.gz 951995 BLAKE2B 32232a0a8e5003dcc056b6916f95274f357ac2ab69a08fde806da12487f63eba273a57049250fc75699fb545e98e25b95dcaf00c67af2ceabe779b8798f24a5a SHA512 696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6
-EBUILD enchant-1.6.1-r1.ebuild 1632 BLAKE2B 7d509e133720a79986abceed4bf8dd987241c3835f418301d1b1bfbafc1a6570f6f76ed34ba1d4d29a13f4a17814c6b289aea5477cef148f2f10daa747614f3e SHA512 caa9000d7b4874b10aad0f8c9c3f1159a5fb6a15e00228eacf5edb14818155a91a575150d6cdc735909b99ff2d07960bbe3f87223c7d333d65bbc0a02d89ccba
-EBUILD enchant-2.2.7.ebuild 1126 BLAKE2B 74c99075bd8fce858a940032ab50edbf0bc31074546cf285c4886bdc8848ef976732e094da7aec7384c41965a6d60cc90a2166363b72e8ea01c3b2f1f730351e SHA512 e55212fde8c27c9c6227db789b27e02795ee6b2d7eaf7c0b1e98aabe612e3e1ad42e9da495dd75bb9b7cac797ad54a0397bfe0f8810b3870c334a6abf9c3afa1
+DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af SHA512 4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090
+EBUILD enchant-1.6.1-r1.ebuild 1629 BLAKE2B adf64823d275f228a0056b7ef888bd399f9e7d0ab0d487ab3316272a0d04e944472a60a90dd16f545b55d742f5dcfff0f05200763ff11492ca576423a59d0e03 SHA512 2f132714843ceccfcbbdbcdeb4a5d24c66635dfeca4f95f676046dc9f0313bd1bf8ff6b62ed5f1ee666649e519dd67b2a3f9b15854e050ddd0dbedd003530edb
+EBUILD enchant-2.2.7.ebuild 1122 BLAKE2B 5286a3e3888a4d2563d9848da9b680649745008d011c548757bc074cb1d7b13f3e60da29f41bc100ee133ab077ddca3bf62389706406dbcd4369da9103007513 SHA512 caaea9e5f1691653addfa29bc85a23c91db0f028cfb27f77ce67009a45e9f3d645f14998125a24d1038ce16488765a58435fa9206697f97a02f56037f02cf189
+EBUILD enchant-2.2.8.ebuild 1182 BLAKE2B 6746db605efd7b96bf22f4c63069cde9a72ed59fcec2b5f5ef54222ea4c25db06b588680c2cbf91fcdfe6b64dfa03038ed574ed3e29811ec05a832cc4bba0e44 SHA512 4413bd8ca42167914dbc33680f03729d9d9d7a28644e55b332084d84cf5b1b908c574b2df0168a81255da5746af896683e36997f887def06e491f72f20744614
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 284ca6473b82..38c1d56a3d42 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.2.7.ebuild b/app-text/enchant/enchant-2.2.7.ebuild
index e9756f02d23e..ffa052358fa9 100644
--- a/app-text/enchant/enchant-2.2.7.ebuild
+++ b/app-text/enchant/enchant-2.2.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enchant/enchant-2.2.8.ebuild b/app-text/enchant/enchant-2.2.8.ebuild
new file mode 100644
index 000000000000..d4c6ef72a6e5
--- /dev/null
+++ b/app-text/enchant/enchant-2.2.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+#	test? ( dev-libs/unittest++ )
+RESTRICT="test"
+
+src_configure() {
+	# TODO: Add app-text/nuspell support
+	econf \
+		--datadir="${EPREFIX}"/usr/share/enchant-2 \
+		--disable-static \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		--without-hspell \
+		--without-nuspell \
+		--without-voikko \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 198285911fce..8d56f49640db 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -4,5 +4,5 @@ AUX enscript-1.6.4-ebuild.st.patch 332 BLAKE2B 88feff57f5dabfb09dce2c11c65e64005
 AUX enscript-1.6.5.2-php.st.patch 410 BLAKE2B 84e35ea8441b60bc5da3085b969f1b20334ed4f9632681b12cd50fbd95d144e40fcd1874aed99a08986432885efdeb70653b0ffed7e5a5b83d5bf1edbff60cbd SHA512 71bf65c91d6d362bbb700ef26b72137e524a969da0971b7f0c30ac409a7f002103769cc25c02222d0ccb1bf69919a419481af9ea479828e3df18ec7a2e1d29b0
 AUX ruby.st 3904 BLAKE2B 854c86166a43715e85e91802f2d82eae71773d9caabf604bd5edc0e53046ed0fa9944ec61c5ff7516e22740cc90ac73dc1d8edbdc0e9722ec876be3a129d2183 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2
 DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc
-EBUILD enscript-1.6.6.ebuild 1115 BLAKE2B f3a004aa01bb37b9e8594ed0ba5518a01371ab159a9d497ce660e68a76bf946cb760dac9b1e47d158a1fca6fe5750695fd84562876c4bf1921efb145172798a2 SHA512 e5573ed9709f912666c77fdc5f3ad3188ede36e7e4f0d76dfd2ca3e288e5838143d387ec44384d02554169bf799a79d47de3e2b20750a086614370922421e29b
+EBUILD enscript-1.6.6.ebuild 1116 BLAKE2B 48fdf41dc6c83d9016d93930a1f4c96eaa37249e2ab49d7abf0cf4e392548cef4f0b4a8534d651d7dcace41aec2c69cd10f9b2307932dee86d35bd3eefa26659 SHA512 5b2135bd7488af0b67f746e79ae9db05059304fc3b3068c5788a1074957ccc9ed3a88ca29eeed4495af98418266b310d4213e2f406b6195ff1ffc605101cfa1e
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6.ebuild
index a0fff20fa58c..7c4cc7ab16e2 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
 
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 96b10c183af2..9a0428df7701 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,5 +1,5 @@
 DIST epspdf.0.6.0.tgz 352989 BLAKE2B 633e2ed29d8ec28f679b00095d335cea4bd1996cf6fdf3950b97084a73044eca9371ac6964ad48e98ea8ddba38d91acad2137ee8d3122ea03df3ce25f08196ce SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506
 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
-EBUILD epspdf-0.6.0-r1.ebuild 1260 BLAKE2B 17fd04a5ac3bb817672f1497361a01e1a2799f1b719d2f310f21f16ba3e8d4c0d107ff224737ea73af042eb703bfee54a2b8e75ff4ce31645ae1001cdc9fae34 SHA512 217ecd78f46697ab7cf05ce67a5f416d0e53e8d06db13ee1998cb3889344e77d47ac4421e4a0434bc9158a7f549c70759ce9950872b8ea983d5e41f48402a9f0
-EBUILD epspdf-0.6.3-r1.ebuild 1365 BLAKE2B 52676e8d006dd0ac4d7a723fdf2d7dfb153faacef0b11623e9d926a854be83dcda37eec6e5e1cffefdeb91dc3f246c155ef88a1c8b0058eb9303b3a178dee10f SHA512 9f90d537edec78139a28b2defeb3ffb253428c1539bb61dd5a394b3399dc3a892b94beb215790a1d0467b627b51797bda278d73f60ab68e432c79460b7098693
+EBUILD epspdf-0.6.0-r1.ebuild 1258 BLAKE2B cb0329c1fa96eb8ea1c66a58fb6c0941abaf76a8f724ad86ad5813f98fa616591e4398ac36820fa8f83d8b11c13a161ae4289d7a5d192745edd78312208b7437 SHA512 cb07774f9cf78f5b3d81770b8bf26cbcdbe08d170d12700c2d28f7022d150bcd0d2a88d4cdc4089eb981a68fcfb4e4bad54763aa248e700a4e74ca9cb21cf52b
+EBUILD epspdf-0.6.3-r1.ebuild 1361 BLAKE2B 0235b16bf07b93688d2d70a3bce5b2a77bfc69d2d265bee434b62c1ab18bf0be596b8e0f1d8bbe5f8c56e4eb8b8e912ad88d994781a76acd912d47d6b1bb486c SHA512 4e3fe579440ca50b638473d760952997279c664494964a110cad006ad2234f58b8a4fa11bfd96b7ee50a9b2e6ae7622abe8348773a07dd5b7b5c6daec3625561
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.0-r1.ebuild b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
index 4fc0c21c278e..ba027bc14098 100644
--- a/app-text/epspdf/epspdf-0.6.0-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index a4c25c3c9add..7b1952a9e402 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 DEPEND="sys-apps/texinfo"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 189219f6a1e1..fe0fbec19b52 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,4 +1,6 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
 DIST evince-3.32.1.tar.xz 2567868 BLAKE2B 8fec9ce1981fb2c5fc60c4b653f462f07f0341ebe64a5615f1e1a123533f8053c6f76a02d05da9245b4263c24df1cdd2e28aa89486b8c802a2aa14cf04faf13b SHA512 29028fedde9aff85e53a5059f63df007e1bac7d662a91fe01e1bb8c48349d5674afe3ce37f9c495e4b208fd476b22f4ecaf749c6d7c3362a03b05703400ece05
+DIST evince-3.34.2.tar.xz 2565752 BLAKE2B 76497c34ce2eb460a3f2c3e790a7c44b9eeddd566854061d49fba2ba7cefa3b523d7bfe973d08b7ec1e8d967e4cbd63c73a668a346bd158a67752897f25827ee SHA512 51bfa4671e17a98c536790185ece6f4f77b956062901f840cd298cdc3e42eb7e8cabe9bfa84387f185cdf7462a322ef54bbc463b988a677af68561e55acd9f12
 EBUILD evince-3.32.1.ebuild 3137 BLAKE2B 0a067e4e869e5077e54873cb27abe40fb5a5325b7ff8d6c4762ffbe9af07253f83b693810005cf1a5777b9632ef5556f4579b316c15f1609b401ed63e3b5bf6f SHA512 5025869ecb300f00bcbaa7359fad3f38da28c95ec9f84d4a65c94e1ec8466125c342a37e4d5a6e9fc2e070e9b034a61d6c016257943e9967e9c2269609c5376d
+EBUILD evince-3.34.2.ebuild 3135 BLAKE2B a2ea107727f813c12297c48f521bb9f14c4368c63d116b5f8ad1b8064124ddf991bb0ad926828ca8d62ba9e199eb7c4e5b7acf2ffc1c871fc9876f8de190e98d SHA512 7a0146aeeef5deb9d3ddfac2770af24218cfb76d99ae519a9a86a69040dcaf5fe4adb0c609e4f12af901883ceaf020b5ae4a42a7945aa060c10d35d975732005
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.34.2.ebuild b/app-text/evince/evince-3.34.2.ebuild
new file mode 100644
index 000000000000..d8404918e5b9
--- /dev/null
+++ b/app-text/evince/evince-3.34.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.38.0:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.36.5:2
+	>=x11-libs/gtk+-3.22.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.76.0[cairo]
+	>=app-arch/libarchive-3.2.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.4 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	app-text/yelp-tools
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+PATCHES=(
+	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
+)
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_with spell gspell) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/fblog/Manifest b/app-text/fblog/Manifest
index 04a4efa5c5f3..ac84fd44d118 100644
--- a/app-text/fblog/Manifest
+++ b/app-text/fblog/Manifest
@@ -1,36 +1,55 @@
 DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
 DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
+DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST fblog-1.3.1.crate 176956 BLAKE2B 71ade0f0327ba9ce97de33c83a1120c578e7dc47ee5fdfbf3ff0d10aac8cf9a0d65cc786c61152813ba4b5a1b19993a7098a5ad1a225fa3fcdc1e1f8e4cacc42 SHA512 1ed97d34d267a1f5b75086ee41687cf3ef66efdc63bb613df76b18271cd597cba4a7087237ce134f21f7a71cb9644a89032b81511d4c365aae60b7a6c07293bd
+DIST fblog-1.4.1.crate 179480 BLAKE2B 0490ff3a368c9943a64221c2a6ff7441e2ad54b7e0ea6b4d195f31c94f69cec6ca366c60dc667823a33d9661b03f959ffd2ea90294144ed6e1b804749c142972 SHA512 a72ebbc8fc1d57b6f3f0c87185cf88d52784fbc68b4e3e92dda8649c8f80dbd06c521f3ab82a2787af74b1af1d47ef448a7ae52cca12e5ddd26cb122fce22e8c
 DIST hlua-0.4.1.crate 30771 BLAKE2B b2b5b39f1a686d57fdfc54d97badd4b612913518da85cf901acf3f18cebaa7c8af8a919f659ccfa47f3eebe2827b742069f63167484f6f62274c07638a548f6e SHA512 992fa3236d19906bbb0dfa1054e89e2f78fa47e858f3cf7b2a6aeb3c6c031c49084115e18640e6fe105535a3fd124467b9f61783aedc5b9c2e670d2fe326280d
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.54.crate 401259 BLAKE2B 6fe5f258837fb21af63b445b2679d3d33a498dd10c7676f30df4a95917358f48995461e41b1ac4c944c079ae99edbce77667e68ce963a7447bf1d35a579e3ee0 SHA512 46f0263b227b107aedbd3c4171d8b3fe60ea9c2413ba9fc4cf3f4f8b92090b7aeec630b687ff55ae4507ff44144dad393a3912c6fc81f8864e630c0f15196cb8
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
 DIST lua52-sys-0.1.2.crate 156154 BLAKE2B 8a6ad1d9edd6ad51febf8ed44b315f8a9578ccfb57408d8247a3f161b62c3c1403fe105963c60b8c89aa210ba03af6384e00d01b480dc16060a648360921f275 SHA512 5318ddcd1d78c40cada7cc64027684f448566257f3c4b957e9dd00b163dab16a8555782de961e500ace3b093ec1e2c9cc04fc6769d7b1e5350d8758028a3056f
 DIST maplit-1.0.1.crate 8590 BLAKE2B 6f673c6ec08df4e239558ac6df9ee5cfb5b9e9af5cd9ac9452ef9e136400d415b9b41aa4ba4b4e6f1ddadbb9d42c64e7ca7496b25415ae19bb2283fb2d148e06 SHA512 8cb6d865e4a3e73d5af5e41bd48e7f971f1a361a5ac7999f915bbd7156d5a90caa07c4ae82d428217b12a6736c362fc64dcafc757b4e7fb66f645cfddc11b175
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
+DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
 DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST ryu-0.2.8.crate 42798 BLAKE2B 393eba320c417af8d2cc23f5fc2874d7813fc3cd4804f7cba1d374f073f74bda4de8208544f30a5650d21cccad28611c8ab2bbdce15ba63b88d6b17100ac5ea7 SHA512 15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4
+DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST serde-1.0.100.crate 73104 BLAKE2B d3557c4f170b31ca64ebd07bba8ee24eaf8e1ffbf192c97d5681dd2b18940c559c31b6fa9ab2e4d24d7b1ce9ec21c0953d37a1a5ee845b0d75d6bd1e870309a7 SHA512 bce506b4d30c9743f69a8c599eeb5bfde8e4951f1700901ce03eb9cd198e3725bcd625121f494f8d12e98200520899917794b5943b355acf8993f00d1ede4282
 DIST serde-1.0.91.crate 71696 BLAKE2B d281605205a041ee0aae9755bcdb10951fd788b57a8f415628580e520950c98cc0edf0761812ed31a818f0d3858512c88faaaca49d16bb9bd72b187544e85c98 SHA512 8a335e214cddd1e1602d6bf0c01dfc5f19276154d846bde97f5a06914e8558b75bcd7eb8cee3273ed255314bbbee6a05f1f4ccaebd45bc5cc16a18c90e8635f3
 DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
+DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST termion-1.5.2.crate 22076 BLAKE2B c4a49c9f8bc28f98d6b99109a6eb824b28cb58badcf3254506cd85bcc61026d900cc3fd95c29971953ba6c0979daaa5de33294e7745b816badba912c5c889d41 SHA512 573432550daf6b9edf60783a056df7f1b40ac51585194c8a6181a7b21b22a9d95d9389b3dbf90a050dbacc8988e7b1bbb189756fb5444e11cabd06b3d6c0119b
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fblog-1.3.1.ebuild 1088 BLAKE2B 53f55738f98edd20e4eb559459359b7cb3ae324679b6969945ac35b5d945cf4b895fb9bcab2686ec72c8dce157ca3092e9f656bdd0f40817ffbe7e6ba74f2d87 SHA512 ad075994c1e144e39b770807c46d20fda50c13d566f8b9242b151d9acad2c2a31e1391f9309c1b4fa270ed081444b765447e064d61cde9aab6ea03e1f8507742
+EBUILD fblog-1.4.1.ebuild 948 BLAKE2B 4af1344bf52e24c2a02a826fbd311676fe9415316c19f63b5c1c8f336c96ca7596c9ea9a8941fb1e027905c3a67d64befc2b64c61bb1bbae7373bba9bbca1e48 SHA512 cc503dee77d3910f404b8f76df56ce898f77bb0df788428712ec20fb7f5fdbb8afe3ed17f23cc49e4288f544e9fc48f4bc13bc356b44ec8a11aff12e4bfec2b8
 MISC metadata.xml 390 BLAKE2B 75706201540fe87b91200fca22103f06fcb7e392ccac62461b7bc1f77a9187b24e2e7fa6ea9723749fc048d6c334098b267530f0212e3554a9969876f109ac6c SHA512 bdb6e4e2464c6669e864ad909c317720516eb6aada0317df8140763a5dd8dc8a6b3653a08884850d8cc30306226f958bdd42879c4d0a232bbd7f21869ed1064d
diff --git a/app-text/fblog/fblog-1.4.1.ebuild b/app-text/fblog/fblog-1.4.1.ebuild
new file mode 100644
index 000000000000..ef8686eba41f
--- /dev/null
+++ b/app-text/fblog/fblog-1.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.6
+ansi_term-0.11.0
+ansi_term-0.12.1
+atty-0.2.13
+bitflags-1.1.0
+cc-1.0.45
+clap-2.33.0
+fblog-1.4.1
+hlua-0.4.1
+itoa-0.4.4
+lazy_static-1.4.0
+libc-0.2.62
+lua52-sys-0.1.2
+maplit-1.0.2
+memchr-2.2.1
+pkg-config-0.3.16
+regex-1.3.1
+regex-syntax-0.6.12
+ryu-1.0.0
+serde-1.0.100
+serde_json-1.0.40
+strsim-0.8.0
+textwrap-0.11.0
+thread_local-0.3.6
+unicode-width-0.1.6
+vec_map-0.8.1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="Small command-line JSON Log viewer"
+HOMEPAGE="https://github.com/brocode/fblog"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Boost-1.0 MIT Unlicense WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+DOCS=( README.org sample.json.log )
+
+QA_FLAGS_IGNORED="/usr/bin/fblog"
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+}
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index 26ba331448e5..af04056a1dda 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,4 +1,5 @@
+AUX fbpdf-0_p20190202-printf.patch 1166 BLAKE2B 41972cfeea7bbc8d1e1840a21882c82050b2f91fff75056067fd00e6ed4a67929f35674cb3e09e5345ce2690cbb92a1676a4ef273f804d866cad5385cc48cc43 SHA512 e91f8158d0a8237010dda66eee289046348b8b657b859e4de1ae22c91424c47775df94f5d58151c930453389e71b4237c07b942c4391afe288e980d19833f183
 AUX fbpdf-0_p20190202-use-pkg-config.patch 1258 BLAKE2B 7542773b6ecf8fed73abcca526d41cfbc7629da44bd3e50649951680469ac7a5f1392a75b4849a8626fe740436bf1bdea9a0131f9e60558f37bb7cdbb1ed89e7 SHA512 6086ff1948ba000c8330aa5fe510b84d74a91254a75ac07c326730c371a4ab47cd2f936ceb888bed4c1520b9fec61a823fb1656533374586cd4fe2466b3160bc
 DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
-EBUILD fbpdf-0_p20190202.ebuild 889 BLAKE2B 2e892ae435016b53f1b24c36c2787ab5fed99976d78c4d9a702c9f0483e284d397385461707bc9961bf3adacc7d18ee8ead7dec892f681a3b7bd562d98ea2739 SHA512 46b45f82db26eee5d726b78810aa403873e6e3ef4bd63ae34d5c15754a5667b4f4e689fdfa3d86200b0dd75b3d0d52b35d53327065391767b28fe4e4e3afc3f4
+EBUILD fbpdf-0_p20190202.ebuild 925 BLAKE2B 7f2caa4ae663a18690013460940ccd040b40cd00c92be732b948f322e98f9ecf2c4309b72dab401f8ea201661a55a350ffa54dd3026eee87a87b0c22d6e720c3 SHA512 841085eede01cb591d166e2359f69b7504b3fe8eaed10d722711f792db0359b00cd7ff3505bcbff53acffe68f1de329e4b768bfcc1629c38b41d4ddcf26e855c
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-text/fbpdf/fbpdf-0_p20190202.ebuild b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
index 029af2a8ece1..2cae3b100718 100644
--- a/app-text/fbpdf/fbpdf-0_p20190202.ebuild
+++ b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ RDEPEND="
 	app-text/djvu:0=
 	dev-lang/mujs:0=
 	dev-libs/openssl:0=
-	!media-gfx/fbida[fbcon]
+	!media-gfx/fbida[fbcon(-)]
 	media-libs/freetype:2=
 	media-libs/jbig2dec:0=
 	media-libs/openjpeg:0=
@@ -34,6 +34,7 @@ S=${WORKDIR}/${P}-${COMMIT}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-use-pkg-config.patch
+	"${FILESDIR}"/${P}-printf.patch
 )
 
 src_compile() {
diff --git a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch b/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
new file mode 100644
index 000000000000..31f9fbe2c8ab
--- /dev/null
+++ b/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/714736
+
+From e89e36c01d09ca6aec03732e922e749257cac3f4 Mon Sep 17 00:00:00 2001
+From: Dmitry Bogatov <KAction@disroot.org>
+Date: Sun, 9 Feb 2020 00:47:09 -0500
+Subject: [PATCH] Avoid passing non-constant format string to printf
+
+gcc complains loudly on any code that uses anything but string literal
+as format string to printf. Right now format string is "const char *"
+and does not contain %-sequences, but should '%' appear in "usage"
+string in future, bad things would happen.
+
+Since formatting functionality of "printf" is not used anyway, replacing
+it with "puts" makes code both safer and easier to understand.
+---
+ fbpdf.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fbpdf.c b/fbpdf.c
+index a58797f..65b654b 100644
+--- a/fbpdf.c
++++ b/fbpdf.c
+@@ -351,13 +351,13 @@ static void mainloop(void)
+ }
+ 
+ static char *usage =
+-	"usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename\n";
++	"usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename";
+ 
+ int main(int argc, char *argv[])
+ {
+ 	int i = 1;
+ 	if (argc < 2) {
+-		printf(usage);
++		puts(usage);
+ 		return 1;
+ 	}
+ 	strcpy(filename, argv[argc - 1]);
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index afbfa685e098..6f845d763506 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,7 +1,4 @@
-DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
 DIST ghostscript-9.50.tar.xz 34613344 BLAKE2B 999af7525ec84448256bac233a81ea3b8d4dcb8cd22fd67dc26dd542840259cef0c1438b85274f1d9c192784ecc5d36cb47a3d4482ebbe19ea8843404f9d0ad2 SHA512 3c1e5db519a427f4b6bfb8d93f3c3dfb67d5ec9ccd19c7afa7670deb768515f3fc617c5588e54934bbfbedfdf8609ce2ffa36dd7da3cb618937fe034f64f43ee
-DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 DIST ghostscript-gpl-9.50-patchset-1.tar.xz 3840 BLAKE2B 12bda8633b5657b1b480b69d5a039be724c1af9a1a67e3509112fb607565e087500d2a6efaacd5e774e0f24b01fa6e8887a56fa0207cfc6fcdc3768b0156f86f SHA512 dc638ffb48425980202e7064ee40f65b0f78041c82601f87035100a50d5e18455aa1b852c8c1d852fa582b8be52276d078d80463e3b25ab73863a8544d0e08c1
-EBUILD ghostscript-gpl-9.26.ebuild 5129 BLAKE2B a202c78e62c9c538feddec48f0f5bf2b6c2f22c4850f2b68882df2b98d67fd69b8a2fe8f7639f43b026a5a057fd88260b8b831c16742cd7536551ae2fa15bb36 SHA512 1ec71652b0d0f9e544c1d49cb661fefd3832dddf9fe83d469c64c29d30182a5c8989675a0431e827ca41cb14bead16d08de1f18a61de1e6d20fbaa38f41132ea
-EBUILD ghostscript-gpl-9.50.ebuild 5384 BLAKE2B a141b484530b72836057e6fa6affe00fda5793b3beec88f96b3ff99bdaf1ddb103cdd3c1c721200389ca0b43f0bc7041b897f9a4c1cf04fe04f94e3646bcfb90 SHA512 894cc5688a07a33e6c4c0d1f21976fb6d2aa9198173276551f3477bcb78cf34c100de7f008c8cc9097db0dc76cedfadec75b97356bbec081301f9f995851cb7a
+EBUILD ghostscript-gpl-9.50.ebuild 5381 BLAKE2B 10c86300876dc50b8ae79bd45cc5df6208244d576cf22558b18f17b2e7e74fa2b2a75b2132dd572c6eec8e5c988c3d95032b189fef3fc876d8330c3fadef7441 SHA512 614783d94a95898ef0727b1285733e6b543190618423d835a186d4fd029f2cdfd3ba038bbc1644451bc48709d0264390b996113c91f1fd5d42f7c9e16a534246
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
deleted file mode 100644
index 2ed247cdde23..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_P=${P/-gpl}
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET=1
-
-SRC_URI="
-	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
-"
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	media-libs/jbig2dec
-	>=media-libs/lcms-2.6:2
-	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/openjpeg-2.1.0:2=
-	>=sys-libs/zlib-1.2.7
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	unicode? ( net-dns/libidn:= )
-	tiff? ( >=media-libs/tiff-4.0.1:0= )
-	X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	app-text/poppler-data
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# apply various patches, many borrowed from Fedora
-	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
-	eapply "${WORKDIR}/patches/"*.patch
-	default
-
-	# remove internal copies of various libraries
-	rm -r cups/libs || die
-	rm -r freetype || die
-	rm -r jbig2dec || die
-	rm -r jpeg || die
-	rm -r lcms2mt || die
-	rm -r libpng || die
-	rm -r tiff || die
-	rm -r zlib || die
-	rm -r openjpeg || die
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -r Resource/CMap || die
-
-	if ! use gtk ; then
-		sed -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			-i base/unix-dll.mak || die "sed failed"
-	fi
-
-	# Force the include dirs to a neutral location.
-	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		-i configure.ac || die
-	# Some files depend on zlib.h directly.  Redirect them. #573248
-	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
-	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
-	sed -e '/^zlib_h/s:=.*:=:' \
-		-e 's|-DOPJ_STATIC ||' \
-		-i base/lib.mak || die
-
-	# search path fix
-	# put LDFLAGS after BINDIR, bug #383447
-	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		-i Makefile.in base/*.mak || die "sed failed"
-
-	# remove incorrect symlink, bug 590384
-	rm ijs/ltmain.sh || die
-	eautoreconf
-
-	cd ijs || die
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		"${EPREFIX}"/usr/share/fonts/urw-fonts \
-		"${EPREFIX}"/usr/share/fonts/Type1 \
-		"${EPREFIX}"/usr/share/fonts \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
-	done
-
-	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with unicode libidn) \
-		$(use_with tiff system-libtiff) \
-		$(use_with X x)
-
-	cd "${S}/ijs" || die
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake so all
-
-	cd ijs || die
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-so install
-
-	# move gsc to gs, bug #343447
-	# gsc collides with gambit, bug #253064
-	mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
-	cd "${S}/ijs" || die
-	emake DESTDIR="${D}" install
-
-	# rename the original cidfmap to cidfmap.GS
-	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
-
-	# install our own cidfmap to handle CJK fonts
-	insinto /usr/share/ghostscript/${PVM}/Resource/Init
-	doins \
-		"${WORKDIR}/fontmaps/CIDFnmap" \
-		"${WORKDIR}/fontmaps/cidfmap"
-	for X in ${LANGS} ; do
-		if use l10n_${X} ; then
-			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
-		fi
-	done
-
-	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if ! use l10n_de; then
-		rm -r "${ED}"/usr/share/man/de || die
-	fi
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
index 67f570317f87..c03e71364a21 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 0c91caa2b977..a36256aeb88e 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,6 +1,6 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
 AUX gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1743 BLAKE2B df825b7de93f6e27279aac3293c993df6ae601a19b619262f634432a54a26ed713ea52c7e9efdb605c0eccf7ef096ad6d511fcca36cadb8ce0f1593cab981829 SHA512 3cc671d04e2f35e4373a1221d5f5fdb868fad5bb6cf89e5a9229e046666d8e3327168dba169586242d064dc0fe8b190fa1768c7f5a9960186f4a9809b51fcd72
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1845 BLAKE2B 1c9d5584242bb4efe965de5cb848980adba9797fe0714c4a8c4f6af23a1409a56340277625f9d290e27c48aeba15d1f854f0212afa9a9ea6e675895393ccf430 SHA512 7bcf73a0d0e2436ff9be2842b34e5299f859be5d007418d4cc2aa4ccd36cdd8f294d20ae2d1de2cd6d4349b0e67cfad295137d004c46512f4aa2d03394493a7d
+EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1740 BLAKE2B 067357992e77226b3269f860641d691688e28901f45fb91b47df2d11fb73a8d45b007c06c988dc7405ce770bdad7079a33a8e38b8b59ad8763b97c7484b811b7 SHA512 a725be5f1511526be3274e653f6cd36ee3c430aaab0b0f787b0dda5157433a1a078749f39a570b9b7e89db2562bc1aca59e24f99c1f0768305afae57ddb59f5b
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1842 BLAKE2B f8e9abceab1c2c83ef521ce3541c8081effd76d8d5427f9075c89d5724ace3d3109e0c10b05d5cd46c87ed649b4f8501e26bce72e66380faa13ee4f5965429d5 SHA512 28945672b9973a45d6a65a81fc8eb3122dee31b6760969ddf8ca593bf34ed10c77ca108f955ff0d38771b38479003fc09d01b5c27241e7db9be1c776644d2e2f
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
index 60cfd313fe1a..cd302aaeaf93 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
index 6918862deac0..4d8f4814fdfb 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index 1c6a899956e2..d024841d210f 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,3 +1,3 @@
 DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
 EBUILD gocr-0.50.ebuild 1198 BLAKE2B d3ee9f332ff3d7b16a29a9f061f7dd3ea5bb5f66cebc26426cfc2ecaee9b10cf205529b704096faa9486910f5ce030923de25b4ea7c96d0fa1008b0135c9ea55 SHA512 c84d04a2188690b718a9ac959b55d0f9aacace22c1084efe1d11339523a832fee6cb1e30e40e8c08e9ee35b045160174ffa57901e7f981097f929208ae914197
-MISC metadata.xml 323 BLAKE2B bb09f6949d6fdefdb0ff856c96a0ab766e9ef11559aed7bc424b6da8eb226f4f9090b708da8b4ab62a123530201bfe721e5e6b505b5a6f3d5cd40f48941a86d9 SHA512 5b38ff42ca62ce001e5041406a24ccd8bc1c7f33d7a9e1f84ca0d5d48a3ad2f80e74732a846ffb6768709748bd2dca5868f76ab4c1b00f1e75a6f622597858e1
+MISC metadata.xml 241 BLAKE2B 0ddb3befa9aa8922cec51c1c82d2927a12fa35eab2474330dd53794dabb7dd58859fc35f02e7b5067111bb9838592f9976fe3ff343aae7f521cdc034cf165a4b SHA512 c0dbe231483dc9dfc42dfe465aa2202145bae8a1ac5794ef9a9f02f687275c525a7826740e3b35fee93ba856ff2a78b214956b02cece209f6322ee3311cbf0ec
diff --git a/app-text/gocr/metadata.xml b/app-text/gocr/metadata.xml
index 822a31236591..de812a8b64b4 100644
--- a/app-text/gocr/metadata.xml
+++ b/app-text/gocr/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">jocr</remote-id>
 	</upstream>
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
index 81316d2620ff..d4be6c3733b9 100644
--- a/app-text/grutatxt/Manifest
+++ b/app-text/grutatxt/Manifest
@@ -1,3 +1,3 @@
 DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512
-EBUILD grutatxt-2.0.16-r1.ebuild 607 BLAKE2B 7b001ed9701393a63621e20c1b418fbe0693bee974e724e702bd8a05e508b4776d433ed3a1aab35b98659ccd10f38bc97f3f8d219ed676fda966c0357b85e388 SHA512 c11020837f5a2a1634eca90329e03df8c8b997204c9311eba76ceb6f5096ba6c172d9c6338fe15bebeecdc010ba3305d559af8dde2ef47623cad17e16df8f167
+EBUILD grutatxt-2.0.16-r1.ebuild 608 BLAKE2B 534c345006207ed5a897470de505c8deee8f03e564a8bfa5eebd44a642b2dea951752f583349d6d901c0ff496de4004369dc56e0b02cc1a998a47e3ca6d39a19 SHA512 0b987a2df776a43d7728061a0b4e18aca2f3c25dfb1348b6e028ca7bae3b025690e3bf6d849efc53b9a62a60d7f15d3b7c908d89968b1912ea85e89ea8ec64ba
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
index 38471d6278fc..871fe3df62d4 100644
--- a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
+++ b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
 
 # set the script path to /usr/bin, rather than /usr/local/bin
 myconf="INSTALLSCRIPT=${EPREFIX}/usr/bin"
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index d9a041de0162..3f52bf29857b 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -2,7 +2,7 @@ DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
 EBUILD gtkspell-2.0.16-r1.ebuild 996 BLAKE2B 444da566b24e6f9beeb5f34aaefb57930f1bee3dfa422f72a6960fec96cb2e76954a1fc2ef968637bf74b5acd782db430a5c76c87f6b87a93ae6bf614321d060 SHA512 55fb0836f0cb5aee5ca34e0c56803d65bae913a4ac15c3677b3bfd2b55907b59bcd7dc77db411ddf89e5b93314b55a0a077e52c9808b8747227855c71d92e346
-EBUILD gtkspell-2.0.16.ebuild 940 BLAKE2B 900e46a78bd3f890ddb19c1fbb7d1f118bcd85560405e2b5b6e263e0ca94291465b4c80fb9466deae78b1d06296f3557f2763a8b713be4f49c7e4730b21e4f2b SHA512 cd01faf1ec556a8b1bbf1d5c17d35c570d9adfb8bf0c8c3dc4185d219f508692bc053618dddeee26123ab8c492a3b8fb8999b1d3377917a71214f156476e4250
+EBUILD gtkspell-2.0.16.ebuild 941 BLAKE2B 8e627d7a438e2ead5777384456514340e2f89a1074f31e8d9749085a6aa5ab9c48612972bb5c20e4260393c98a6eaa59240fd8c41b6529a51877e4bbc72189e6 SHA512 be3c7832de7f75f545aab20f95cf51024614c963382d2f453b44a3236ddc12b957eac45599c35ab36322abf65309d862ab367cf1ad6d545ccc95fc136d26a093
 EBUILD gtkspell-3.0.10.ebuild 1067 BLAKE2B a923dbea388402ba9d5ffa9a7b3546a3d981b415e5db1118d421f7a4e472c2bc3edbf8fb8ad314845376b4182c0511be19925783ecc4932326f7839d9109ee45 SHA512 df7fb08a67b8f02aa4f43fdb6b8edded00fe235ee26e0296240f032d0c595b531fe248d34ee3b064a733000b2bd8479012dc6b1230c5944b5ddaeca97fd021b7
 EBUILD gtkspell-3.0.9.ebuild 1069 BLAKE2B c7583baaabc1e860028ab1dc41e888d9e591e2eaf9e388c6dc5ee596d8b852da1e3ae4e36daea86a4e6eecf6977b1564bc9b1636a58ff462eb9b2ea20b22b4a1 SHA512 cffae0d5c3dfeb1c4750b4f3a6296375145896a20a3dd2d9013cff34b9fa95f5af6ea4dd7b9a217a46de478f68283d5720b23f1b6a0ada1a95106798e382d997
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
index 16326002e916..c34f0b73d97a 100644
--- a/app-text/gtkspell/gtkspell-2.0.16.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/app-text/hd2u/Manifest b/app-text/hd2u/Manifest
index 68b3f2e4d634..d32f8aeaf020 100644
--- a/app-text/hd2u/Manifest
+++ b/app-text/hd2u/Manifest
@@ -1,4 +1,4 @@
 AUX hd2u-1.0.3-build.patch 666 BLAKE2B 14d1e7cbb7c7302ec0aa1354c4d0a493645f8bf4bf9e4c2e2fa2bd61b04e0e7e8f90477deb6a73a1777ff2f12ad13cdd97f604d889778759d7fe21222772eff6 SHA512 934fe3043aceeeee5df7ae5879198d385639f5b489581209c44e7ec91f5d05216424bf5652f557e154a1a442633848ebe1167b61af9c9e374cd30594744f4d7d
 DIST hd2u-1.0.3.tgz 60024 BLAKE2B 9dd57f2e15add3643aa92747836164b18c9c6554c435b718cea6b4e8d1455bbd775f9d4eda0f10a9bfe3ccb5dbd634a99b367ae849bce2145d9b1114400a2b1b SHA512 d354964f0ad5392315767b96438d843a5f1d6afe78da5b0c5ea65a3b0b2a61beabff3ecac89df81b9271a14ca443f23dfffeb51815e02b724ad287e42fc2d6cc
-EBUILD hd2u-1.0.3.ebuild 475 BLAKE2B 5c8944573977ca83acd35e67ec119342fbbe7b4927958f902b712a646ad2ed9e2e9f0cea5bd632e27be43a6058c9e3e936486bfca94c645e776e9e7e2d5cf425 SHA512 5e7b0f406b802202cc63c3a1f54878dd136dabebc833f7425f3992bb172f494b345fe5d07c92b405dff8312b07cc5e57245f01f38fc48a732afadd6c6281f95e
+EBUILD hd2u-1.0.3.ebuild 476 BLAKE2B de695ed3452a06f72f8abbb5982d35748673bfd383f3be7cb2cc8206fdda684b7e7d6aa31a46b3acae9bab89ee52fdf4b8a5a8fe606da9da402cd9bf1c76be58 SHA512 60a65f35eb1df432edd2c3537e361ca4a502c5825bb420f9a59d4b41a3501931c8430551416e304b53eaebf886428a0fe06ea3d32623044e52cbee49d6f46f83
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/hd2u/hd2u-1.0.3.ebuild b/app-text/hd2u/hd2u-1.0.3.ebuild
index e436af4d62ef..17f3c31a1fc5 100644
--- a/app-text/hd2u/hd2u-1.0.3.ebuild
+++ b/app-text/hd2u/hd2u-1.0.3.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Dos2Unix like text file converter"
 HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
 SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
 
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 952da3553877..ab3aa88bf6cb 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,4 @@
 AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc
 DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80
-EBUILD highlight-3.42-r1.ebuild 2205 BLAKE2B 9713475cbf857691a17b90359acabb0ea4442b3a1800a6305ce89068cb239be941feb50d98dd520de824376c8db2b565ee52c77c3c8f7ef3fe6b8b6970c5b53d SHA512 87dffd94986bfd558f0fd48baa002d5caadc9a7b6dd384daceeffdd0cc1c1ee1622bf9743c565ff9895bac0bc34bcefb6ebeaf033be25e5dbad628135b993adb
+EBUILD highlight-3.42-r1.ebuild 2202 BLAKE2B 0b5d44fa0a2a9075e5b55ccb8c09f80dfd6bf0f00b0df7e21ea61d620db70442cb06ae5f0890fd0ee834673975255b9131cb77fff5d316109bd876f81c40e55e SHA512 24666e1693f84bf9f3f285f2fd0130769890ebce3fd67dce262cd9411a3c5d35d5b1cd28115d38269f1811f14322d676bd07f1cc521a529206408681326bc0e4
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
index cf8e1f2455c3..513d088c6f28 100644
--- a/app-text/highlight/highlight-3.42-r1.ebuild
+++ b/app-text/highlight/highlight-3.42-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 RDEPEND="
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 1653fda24af9..78449a5036f5 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -3,5 +3,6 @@ AUX html2text-1.3.2a-urlistream-get.patch 186 BLAKE2B 600aac564090a318cd60085836
 DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
 DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
 DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
-EBUILD html2text-1.3.2a-r2.ebuild 967 BLAKE2B 785eacb30b4f2f9ab9557a4ac40b79fe92e8ef15ef6b6cfd95731790193502ef8808ced022aceed476dac1ef8984dbd7836cd7512acae15722cf72d4dcc76103 SHA512 57ff6068fdd0cf1e0987fee67456b2d6d17f791049799680bf589d5e65eb3d21a57b83338a6e980dee81484eefe1e2be3a8ae72bfc1b541d0161f013825aafe2
-MISC metadata.xml 373 BLAKE2B a4ea5de91e4a5f5a7653f4c9d86262c999e72c69863f0185700bd4fab6c27cf87d3e392aa013dd4b60a84b1ea0ddc42d811c4131c8db3ba427df86df7fa4abb8 SHA512 ae24dd6abb85c0abb4085f15c9c140d2dc3bb0c201ee22f1762e1eadc37899e8b5aa5cb794f9cd12bc26857195c9b9ba8cfa46d05628cdf765ddfc0639dd6bd4
+EBUILD html2text-1.3.2a-r2.ebuild 968 BLAKE2B 00c6c5b53923a5954ea71126a4bd47cbe437a1482f0da36a44bc8862cf92f03fc6ba69a328e8e80e0dd61ec0a41eb35e66375ec940bf57fd98c1c68e5eb228c4 SHA512 fa461dcf03442c9b9d3d4e19ebdc6005f4dce9749120fba622d9aac7dfa2fe60fb3b33d4d701e67207869deedf98bb64089d8a03f2b77e4eaf8a8b620bb23964
+EBUILD html2text-9999.ebuild 702 BLAKE2B 6d89edf6e564980d80a24f583429d7764a357811f0a2187469dd8c30248f6af2ea9f1c4b7fdc2647ed2c28c36b741d6a2060c5851db1ff2674e457eff28dc999 SHA512 acea33e2295c301054211c641e3c8ae59d9cd394dae4755135b45b0866d6b588e13ba7f7aa80b5d4ecd8ce675c0426d8ff02ebad0887cb1ec6c89e7718c874da
+MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild
index fd5f78e322fa..38ed69968534 100644
--- a/app-text/html2text/html2text-1.3.2a-r2.ebuild
+++ b/app-text/html2text/html2text-1.3.2a-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 PATCHES=(
 	"${FILESDIR}/${P}-compiler.patch"
diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
new file mode 100644
index 000000000000..3093b0ab8ec4
--- /dev/null
+++ b/app-text/html2text/html2text-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
+else
+	SRC_URI=""
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+
+DESCRIPTION="HTML to text converter"
+HOMEPAGE="https://github.com/grobian/html2text"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+src_prepare() {
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin html2text
+	doman html2text.1 html2textrc.5
+	dodoc CHANGES CREDITS KNOWN_BUGS TODO
+}
diff --git a/app-text/html2text/metadata.xml b/app-text/html2text/metadata.xml
index cd4b982119ec..a53ffbea77d3 100644
--- a/app-text/html2text/metadata.xml
+++ b/app-text/html2text/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jazzoslav@gmail.com</email>
-		<name>Jaroslav Rakhmatoullin</name>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index f8c83db1170d..cd2f98db459b 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,3 +1,3 @@
 DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
-EBUILD htmldoc-1.8.30.ebuild 1111 BLAKE2B 88ea3e4187bdb8ceb905b30b5fab12f66dffcd96f1c1dbfc4c0c1f8fd77e68f1764528ee83629b02ff644864ccc5c6fc603572ef9ae0415a72f2199df8b73d00 SHA512 e695c9c6c45c04a9bde903689177257e0d826f1dc3802581bc5cf7ca5eee9b46f4e01b5c95925ca07488fd8318cbb3215a10a116fba94540ee35d07d98877a3a
+EBUILD htmldoc-1.8.30.ebuild 1112 BLAKE2B 5aadf30d8e616123ca12fa723049f179d790e3bee421fa38bff8728f2c737943249c5692d22a4976086ca190f8e13097b818cd64df5e730c1a00c8b1a4cb661d SHA512 b210f0379cd075b7902052bac96685eed280774c859784379aef143905ec4a26b3df5b3b3dc4106bb6f2aa25da175fd725123c0eb41afbedeccbab183a7e5c45
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
index 6a0492e0e90f..cc2c5a5a5668 100644
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
 IUSE="fltk"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 
 DEPEND=">=media-libs/libpng-1.4:0=
 	virtual/jpeg:0
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index dcdb6f5ac34a..de2aee9f4a88 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -3,5 +3,5 @@ AUX htmltidy-20090325-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce6
 AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
-EBUILD htmltidy-20090325-r2.ebuild 1979 BLAKE2B d101eae87043df7b5f0eb93d1e045246333608f92645415688ab54002c80f783c2ec5d12d26cd0813b9e8d99fbc17be1394268668465003089b819530fb56915 SHA512 f9f5694ed07cd7a5ffd59ca4be8c17597859c38ee4f46a93192eec98e836d6a50db0f87052bf910aa171d392ca31ae0bf6bcaa2c5f0028577f219b543a1dc2b6
+EBUILD htmltidy-20090325-r2.ebuild 1976 BLAKE2B 05f5b0708bbaaa12b285939dc86f09958f2bf3ce0ed4ea83814660ef2534e507e054122aba9ab4415cf6afd1a82676bd83ce035b487a1f28e1885b2b07ae2677 SHA512 9f7d3d4c05f036ad262d83fec3e0d246c41389a2faae759fb6cdc3ce6185b37bf1b9818d79c7d3307b729020c5c437dc187888376ecf0140d659f55fce86a720
 MISC metadata.xml 299 BLAKE2B 45af58b9f27f8329d072008a1089edae34741b855b1626cc56eb97efef684b316ce5573308ef1e73d4aa7e1cde74b0c10d5d7becee71707f5b3439f451a433ea SHA512 cd21089fbc56a2608734a5821826da373a5112e1676bf3c3481320236f5583ff1240e118e0021130625826c76cb426ca681e0dec3c6e4d2df22f8967da15321d
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
index 4d2158e96599..810cfcf24a55 100644
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index a23eca59af99..940dc60712ed 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,5 +1,5 @@
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
 AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
-EBUILD hunspell-1.7.0-r1.ebuild 2319 BLAKE2B 857da415a1f0db4ef99f5ae21bd6e8887a53b1ece545e31563961309f0bbc8770f56c14590160eb800eb3e550241560e34080b154fbced069abb6fcb49443f83 SHA512 958ac4af5756761abe98ee17336469a51b3fa7f23fcb2b715883b2abf5df34d83ffb1b4e4b8b339cd9053c126541e2dfee5e8efd6b30158a1ae4a5fffb53d309
+EBUILD hunspell-1.7.0-r1.ebuild 2317 BLAKE2B 9557168fd901afe16a8402a682cf06cb97f6a6fd367caef811e31acc92f04f2b77a907d409e9d77b6389425eaad901a0084bb8d38d69935648da4bda9ae6ac47 SHA512 e2926c1860838c46fcddb6bb7c05462d6908fb188791ddcc677243394cf46902ed01198c53e137f7860c418c27c20ac59de21d4033fc624c168fdd60c104c69b
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
index 272ebcc1de9e..77c6e414f32e 100644
--- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 3f601b5c3ee4..795964f32532 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,5 +2,5 @@ AUX hyperestraier-configure.patch 11535 BLAKE2B 970d53c28c1dcc1bbd2f2354542e80e2
 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.ebuild 3507 BLAKE2B 83995d8222fb635036f8e0ff5aee8a1c718449254633aa10298251244ad071f6704472aeb49beea4c638d4df7f5c56e7d9f6ba1be0b9ebcd73ecb8a1ecf0e168 SHA512 6ee5770a053302f183e9b9edc3d917ec8adf89e227ab77eef336af03b129bb0fe5f5395143958ee8df7cf6c2f3035aba4f6c313dda3e94172085f4a46955ea0a
+EBUILD hyperestraier-1.4.13.ebuild 3508 BLAKE2B 01fd8d63d33c745be1447ec1fafec877a10b79ead0087d45155002bb23e849bae7d7502b8a97d5eb194a5e649519d78bf65f7c02befac482e4f343e5854dfd4d SHA512 2733f4c3b226e22384f84383ea8c47a5613dd2724618f4dc840102f3c3a855cc35af6386582f4460cc4d5a723e3a8018cf71298db0ba235aa833cb610fe72e5c
 MISC metadata.xml 423 BLAKE2B 188de835ec6f287d3a72451770f6b7f8c93758c6579b31182bd918127b9dd3c91c13813451d611d4cf24e4dd29eee21f9b214b8545250ac23e26cc696ffee719 SHA512 60323531c2e899eed9db9635ecc0cf11d1482738006e86bbcdfb74e931b1e0ce1cc7741619d3b473d504c35d4a73f4542e2e6904e75208a4beb818fcf7d06723
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index c7438a732074..2d53618faabd 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://fallabs.com/hyperestraier/"
 SRC_URI="http://fallabs.com/hyperestraier/${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"
 
 RDEPEND="dev-db/qdbm
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 2f67b1e0f460..2d34d0ddf390 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,3 @@
-DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
-EBUILD iso-codes-3.76.ebuild 2410 BLAKE2B 72b76f1f783b774af898915ef548c2e1456562157579cf4a63512c82e91044bd4647f77e15ae9b3435458600acb53311dfdaaafa3f61ec180656b2672dfe16c4 SHA512 169c360a6da06810c9bbe57d29bc050ac2088f3536971cc2d5d2aab47ef64b801b9cc2a7b35db414fa7c5067201de026e46c306fbfb9048e001144b082bf7d40
-EBUILD iso-codes-4.4.ebuild 2633 BLAKE2B 0ce1b3565dd738ad71a86acb3754779d6a41c2955932754df6bf33468a3255ec2851a330a62d9e539ec6bb637ff9f145377071bd7e992d41a137934a6e256f45 SHA512 2c73e8d9caed70b4c0d936cbf5539a6f4bad26de03fb36215a0fc83840fb88c718e7f43cb11d28f59ae092b4b4b0e9c650a1fe1314aefda9842cfa9bbbcd28a9
+EBUILD iso-codes-4.4.ebuild 2629 BLAKE2B 778f41db50687e37bb907a96679ebe0b4e1326de001ebd35c639fc31e8503d6c90e987301549a8ccded3bb4170ea9861f32c4869f32eba4300bce1d79569f000 SHA512 bbeef6811b6b7eaede64f812e4b1db7400c2162c39b4f01d5183f809cd3a5ebde3b6b457e155980781450362250deede83c454ca99545c0b037b1d98402874fc
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
deleted file mode 100644
index 13eee6bba9c5..000000000000
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
-
-inherit eutils l10n python-any-r1
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
-SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-
-# This ebuild does not install any binaries.
-RESTRICT="binchecks strip"
-
-# l10n_find_plocales_changes doesn't support multiple directories,
-# so need to do the update scan ourselves.
-check_existing_locales() {
-	local std loc all_locales=()
-
-	ebegin "Looking for new locales"
-	for std in "${all_stds[@]}"; do
-		pushd "${std}" >/dev/null || die
-		for loc in *.po; do
-			all_locales+=( "${loc%.po}" )
-		done
-		popd >/dev/null
-	done
-
-	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
-	if [[ ${PLOCALES} != "${all_locales}" ]]; then
-		eend 1
-		eerror "There are changes in locales! This ebuild should be updated to:"
-		eerror "PLOCALES=\"${all_locales}\""
-		die "Update PLOCALES in the ebuild"
-	else
-		eend 0
-	fi
-}
-
-src_prepare() {
-	default
-
-	local std loc mylinguas
-	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
-
-	check_existing_locales
-
-	# Modify the Makefiles so they only install requested locales.
-	for std in "${all_stds[@]}"; do
-		einfo "Preparing ${std} ..."
-		pushd "${std}" >/dev/null || die
-		mylinguas=()
-		for loc in *.po; do
-			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
-				mylinguas+=( "${loc}" )
-			fi
-		done
-
-		sed \
-			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
-			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
-			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
-		popd >/dev/null
-	done
-}
diff --git a/app-text/iso-codes/iso-codes-4.4.ebuild b/app-text/iso-codes/iso-codes-4.4.ebuild
index 9979cda36b9c..07b7b361704c 100644
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ b/app-text/iso-codes/iso-codes-4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
index 3311bde803eb..a450eca61b0d 100644
--- a/app-text/jadetex/Manifest
+++ b/app-text/jadetex/Manifest
@@ -1,5 +1,5 @@
 AUX 80jadetex.cnf 995 BLAKE2B 1316aa328e42553d13ba377512bb1c7301a62ee60b8351a9209dbdf7ebd306f092e9b3e35c6b605c9847a1fd931cda3ccfb042a30ec3415b59f1c88537ebe55d SHA512 b1e940b79bbb76b3ad02c82e25120651ab64259be104849fc39aee94fcedaea091220b6896217faa84f93a45cbafca5b1855396b47210952723148b69d9727f9
 AUX format.jadetex.cnf 170 BLAKE2B f6f923eb38263e054ef470f0e9bb8f4beae75a9ea5f5df380077e1661e22fed024e1f77f56f8419127bfb831b7409f486cd53bfbf2aa81bb80a2c47ec674cf2a SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b
 DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
-EBUILD jadetex-3.13-r8.ebuild 1644 BLAKE2B 86613691c563d9dd661b3f9c2832538010e776251dacd477f67b4c88f492f1646b06ba7baab16164a32ec2b769ca21a020479f833425ee0198cc4c01098cfd0a SHA512 226e020c2eba6a0541e7ce4056cf422b936c181e6c9e5da869f4c259a2a66e14ba1f1bb410e86118c2c5a4e1c310737affbb39df9e534abd849a11b69f850960
+EBUILD jadetex-3.13-r8.ebuild 1642 BLAKE2B 2ef4112f532ad914571f247ab2b696cd2e973366b3134342e3b32b814b6f246f16b63831ad77ae1694eae7d5403515c2f18916755a621f29c0f8c560cf7a6d55 SHA512 d9feff4b929052d95cd0ee67d8c51a5cbeee1585b5c83a85afadbd2c0a2ea8f7b2fc79b37fa9453b79c25dce85d1799c600c03ce02cf1be71f06aa5a56110edb
 MISC metadata.xml 326 BLAKE2B 43480e556a9ce9c52fc46d18765664881cbb16ea08954b18d357df0a956d335815e9a0c3093504bd68a5b2249bee307ca05030fbe7fb4324beb8fdd7ff8b2e53 SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915
diff --git a/app-text/jadetex/jadetex-3.13-r8.ebuild b/app-text/jadetex/jadetex-3.13-r8.ebuild
index cc5856fae3c0..14ef920d50e5 100644
--- a/app-text/jadetex/jadetex-3.13-r8.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 RESTRICT="test"
 
 DEPEND=">=app-text/openjade-1.3.1
diff --git a/app-text/keepnote/Manifest b/app-text/keepnote/Manifest
deleted file mode 100644
index 2ac485a2e3e9..000000000000
--- a/app-text/keepnote/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX keepnote-0.7.8-desktopfile.patch 1195 BLAKE2B 4dd5dd1eaa5893b7aae496215fb7c6206632b431025fbf86354391baefc3cdf64a4852e0aaf7cfc538be6dc56d2d89336b465491c129b77aaae4893858e4cb00 SHA512 f2b59d656573bd052fe2b26687338939ace7cfbbf71a0ef051c45b829662ccd601f08a406de87cbd37391dfe2743cda13b58bced26fa2186688289a008f8d1be
-DIST keepnote-0.7.9.tar.gz 786634 BLAKE2B e14b41f6d5e983ef4ef27e10a2b39f8972cfd47c34a15f7efd97c1c809a29c50554d5edd5fcd0ff8624861fc0a33662c6f00eef675519fdab11d8cef9b67da1d SHA512 1d818fab1fea69b6369209dbaad403b2431352ba359d4f233ab412fd56a57e970b6b6adf63201811ce45faee471cf3521c6b4ccecc67f3befc727b2e77189ac5
-EBUILD keepnote-0.7.9-r2.ebuild 854 BLAKE2B 950323f0c34cd0dc4511b215db9e7ff5906f37105dfa168568dfccd1d13c6ffdd347eefdcfd4cf7d907c5272af045d51c0518b1551f49044c093c7377848d680 SHA512 f3c26859af94cae7c6dda7255f2d03d105dba5493e3a468b65617c062dbb9d5c23f651b11b0b6e68aba0b59da4a0b18edeae23b5f54e37d76db273fff48286ca
-MISC metadata.xml 785 BLAKE2B 03dfc70d07b076f7769481f33bc2df9c1cb6458579486495c49f43f670fcc31b7f246b5555366b2f0f01e16d44b507929c04400d41b9bcd89beea9df1a34b1e8 SHA512 7d04a216120b8d52d73e4a4a1f8972b59d63c50c23f398be9ff7a8b0d5d37d793b5c7269579d05fd517da7c813ed68eb3381613604b1057c39358700419c072e
diff --git a/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch b/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch
deleted file mode 100644
index 7c06aab2c91d..000000000000
--- a/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Aug 14 07:08:05 UTC 2012
-Subject: desktop file
-
-respect fd.o desktop entry spec
-
-# desktop-file-validate keepnote.desktop
-keepnote.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
-keepnote.desktop: warning: value "Note-taking Application" for key "Comment" in group "Desktop Entry" looks redundant with value "Note-taking Application" of key "GenericName"
-keepnote.desktop: warning: value "Program na spr?vu pozn?mok" for key "Comment[sk]" in group "Desktop Entry" looks redundant with value "Program na spr?vu pozn?mok" of key "GenericName[sk]"
-keepnote.desktop: error: value "Office" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
-
---- desktop/keepnote.desktop
-+++ desktop/keepnote.desktop
-@@ -1,14 +1,11 @@
- [Desktop Entry]
--Encoding=UTF-8
- Type=Application
- Name=KeepNote
- GenericName=Note-taking Application
- GenericName[sk]=Program na správu poznámok
--Comment=Note-taking Application
--Comment[sk]=Program na správu poznámok
- Icon=keepnote
- Exec=keepnote %f
--Categories=Office
-+Categories=Office;
- #MimeType=
- Terminal=false
- StartupNotify=false
diff --git a/app-text/keepnote/keepnote-0.7.9-r2.ebuild b/app-text/keepnote/keepnote-0.7.9-r2.ebuild
deleted file mode 100644
index d991974ffc3d..000000000000
--- a/app-text/keepnote/keepnote-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-inherit gnome2-utils distutils-r1
-
-DESCRIPTION="A note taking application"
-HOMEPAGE="http://keepnote.org/"
-SRC_URI="http://keepnote.org/download-test/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-misc/xdg-utils"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.8-desktopfile.patch )
-DOCS=( CHANGES )
-
-python_test() {
-	"${PYTHON}" test/testing.py || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	einfo
-	elog "optional dependencies:"
-	elog "  app-text/gtkspell:2 (spell checking)"
-	einfo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-text/keepnote/metadata.xml b/app-text/keepnote/metadata.xml
deleted file mode 100644
index 406d1cd53480..000000000000
--- a/app-text/keepnote/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer status="active">
-			<email>rasmus@alum.mit.edu</email>
-			<name>Matt Rasmussen</name>
-		</maintainer>
-		<doc lang="en">http://keepnote.org/manual/</doc>
-		<bugs-to>https://code.google.com/p/keepnote/issues/list</bugs-to>
-	</upstream>
-	<longdescription lang="en">
-		KeepNote is a note taking application . With KeepNote, you can
-		store your class notes, TODO lists, research notes, journal entries,
-		paper outlines, etc in a simple notebook hierarchy with rich-text
-		formatting, images, and more. Using full-text search, you can
-		retrieve any note for later reference.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-text/landslide/Manifest b/app-text/landslide/Manifest
index 9c1a276e5998..f2fc6d11efe3 100644
--- a/app-text/landslide/Manifest
+++ b/app-text/landslide/Manifest
@@ -1,3 +1,3 @@
 DIST landslide-1.1.3.tar.gz 151003 BLAKE2B 471cc83cbfc1c7ddc437b88514fb48632016e0915fc27c65d502a71b94f83a1184de8a7dbfaf2af8b75963e687c1af903add48e5ac8893308d9cfa07fdcc4c61 SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152
-EBUILD landslide-1.1.3.ebuild 800 BLAKE2B f7967ec31d171077049fe4678e56d5c6cda00fb8cc89c7be3b45efd41246c278d4c2a9abe3b71025597faa02fe60573efde6d7361cc92efb7133ddf6ea70ad18 SHA512 bbabe6c7f7aa25b01e1a822968d09cd07ede7755ca7163018c5d7fa2db918f0739447c70d93434fdb80abf9ed037beabed681fe3c1864e6cf7734b1f4ca13f38
+EBUILD landslide-1.1.3.ebuild 853 BLAKE2B 9739d8899fad89a7fe7461014a251e73a726364bdb11599f55c4b337dc3723f8b2f32c36c6c23a6087be85c642b3def53169cc35cb71502a4e064172b2ad62fd SHA512 7e78381458c8c8b78c13fc85a7c9197e49ba241c83ba30b1434079ae35268667882a86c95c6c0096b0cf9ad608b566c84b7379bbcc0ed8239e662966feff32b0
 MISC metadata.xml 298 BLAKE2B 15316fb3bd0eb0be967bec08510269e31406e72c3cc7623d21cc2334bfb36b8031bf304c4627b085fa64cfec15964cf9a6a486ba29bf312facf1589f36cd9819 SHA512 19a5bf1f42b94a00856b856fc0120024df40a4394a17e61fdacc817d1b355b601595a27cc0f814d3f6b436775799b44aa4f5090daa91452b55d4760e8c89b8d0
diff --git a/app-text/landslide/landslide-1.1.3.ebuild b/app-text/landslide/landslide-1.1.3.ebuild
index 8f2cfe02f2b6..d611bf5b0a04 100644
--- a/app-text/landslide/landslide-1.1.3.ebuild
+++ b/app-text/landslide/landslide-1.1.3.ebuild
@@ -26,6 +26,10 @@ RDEPEND="
 	"
 
 python_install_all() {
-	use examples && EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index f5a17e1e856c..e434ca1b5e0f 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,7 +1,7 @@
 DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
 DIST lcdf-typetools-2.107.tar.gz 652445 BLAKE2B bbbc428673c8e036f8d3be8ec80dbcf8892f60976fee7f11d622af8442c4d3eda0e118d47b364f55fe0dc8b53062ece0926be1d67e6627500a787bce810c074c SHA512 be54d4346d567c640b260dc513854085901af96b82701fccb8f0feae4b373ac69962c568a648515eb9ebfcabc828359ab2d742947ccdf9422643b0d889961ff3
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
-EBUILD lcdf-typetools-2.106.ebuild 866 BLAKE2B c80da500d92394b970b0fd1f60ceb08a8c185903772a6a9bb87b03ca8e99c8d0b627a51aa54f34edb9bd2f0d64c39015c82d869f1f31b39d4e0fd84e4eef8da0 SHA512 84a154841514977883070d99e0b98d0e7b39c92a29e8606c7a90f7f55cd622512583ec700dc50b4b0e504d116d7c574e43ac929eca647a43e5d203228cfabac0
-EBUILD lcdf-typetools-2.107.ebuild 877 BLAKE2B 7995727fe87f1c6c1ec126fd514195dfb94c73bb721bf6fce98d83a64b16d523d89e712e40bd0483c6cb876506740f84baba1f2f513443be97ad86297501313c SHA512 15aaf39828f08a6415a8e1930332fc64805d309144d9e1f06998d422129c1e82c4090f50fb161acd0b7816242e086f38d865bb655a4054339bc11f7d36de3aed
-EBUILD lcdf-typetools-2.108.ebuild 874 BLAKE2B 5118bdd86da617e6e8d88f13ed4cfc33364b7a6ce729fcb04e435dfda8193ff508fbac19bf690f3c7edbcb373cf54f072b6ba00526164422f3d512101f49f84b SHA512 6afd443bab6bcae29e392a9eae8ab33b6c5dc95dc1b59888e56cc90264c8430592b1746f235d0b824845bf9849ad8e9c3575f8dee3628c4a675d02afd0901477
+EBUILD lcdf-typetools-2.106.ebuild 863 BLAKE2B 7789c49b02c9c7f4be70c853d4a8c90537b4d77e7386c875a2b06e777eaf4bb4e056d2d4458308b2d30b4f52f5228813fe80d6e361a75af08823bfe779ed4a8c SHA512 50ca06f247bdc12a597989c94073085e3c0efbe30345c3b6eab63b6d0a34c92f2032ae4b9e968f7d7f0268472287c3f094eeb197f22fe45fc462e54544e1b046
+EBUILD lcdf-typetools-2.107.ebuild 870 BLAKE2B dc9521fe2510e84e01410a8e0f9b1ab67f6f2b991bb85eb28c822f7dc3cad20c00833c6ccc2385b9a2ab21bf6b9e7115116c9325cd35ced95ca2025c878114cf SHA512 012fd232f0a36178e410ff311b6fb75a522f2dcea6ae4d97a06123a944422c09945fd01722da51f22c271176554fd8616093fd22fdcac48666c668ab5007cfd1
+EBUILD lcdf-typetools-2.108.ebuild 870 BLAKE2B dc9521fe2510e84e01410a8e0f9b1ab67f6f2b991bb85eb28c822f7dc3cad20c00833c6ccc2385b9a2ab21bf6b9e7115116c9325cd35ced95ca2025c878114cf SHA512 012fd232f0a36178e410ff311b6fb75a522f2dcea6ae4d97a06123a944422c09945fd01722da51f22c271176554fd8616093fd22fdcac48666c668ab5007cfd1
 MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
index 0b4ba648a60d..7ec4a8f6ff75 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
index 8e7a134d43bb..54e4b30c16d1 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
index c3cb17fb388e..54e4b30c16d1 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 79c98f4955e9..875c271244ba 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,6 +1,6 @@
 DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
 DIST lesspipe-1.84.tar.gz 119657 BLAKE2B 671b504022bdba82eea03d7a83960d5ed148d851d0420f179967f46d38a88ab90c9928a462e01744134aedfe710dba741430e78743451b1b65e603e5d89ae139 SHA512 f11ef23610f722d62ddf7e084b03967ed59d21af6ac207d4456f625c93c3c58c87ec5907cf6bca00ae5550dcddfc9b7f0be5de51f9ff81044fcff1f1cde81267
-EBUILD lesspipe-1.83-r1.ebuild 1101 BLAKE2B 083f4a7254d2eafb8df257d8f9a63ed78de23b48917afdc45e6dff3e1a10c9a36383fb675b4f450b36d6529a839249dca79dcf149b6f18f71767c313508b6eac SHA512 325fa0a6ff63285ae2254c54c96883c7bb71660272933b4eb76ec54d41cf9415e9879da78c7b566fc8ebc25dc2930987146d0f8fa977d369f50bd9f55efcb880
-EBUILD lesspipe-1.83.ebuild 1114 BLAKE2B 0371b148f99d97a04c4cca30ab71b001ee71ae191615718fc76bedba2a0caeb131ea7a964bf4d2e1af2eb3a1c13d56b914567d3c4924a8e6659005180275edcf SHA512 03c59a5dca37304c89f1bac9c78b170fec806c268d0c338d479ab81e7f4f45c0970c699f1999b9eba90c67ae5cda79e31677cac43ed465a95a3a9892030edc30
-EBUILD lesspipe-1.84.ebuild 1107 BLAKE2B 16351d23108a2bffaeb40d003555e6ce6f6198f572df64745a6b366e6f3e88fc3402bab6c897cd9a09a1abe766fe4278935269f7ff85fa20564ca4f5f7ab6bd8 SHA512 bc603a619b3046c24b4c6c37cd81a7012626ce8077cf0d13fc6201de01539480019581231085e251a67c7b3a7b8f02e8caa00a6732e8e5fcbad57696d7233a0c
+EBUILD lesspipe-1.83-r1.ebuild 1094 BLAKE2B 3d3fff0a0f1b8f70b85b691b112766c7f6bd4196a629f87b95b4a84955876b3ee7de64909187277d34dd25c62c4aa0820eaa0a6110fd320749f286d23e6e0a23 SHA512 793e84d2a2014a0345d982972ef573842827c77c840fe04b4c9b7ce22c37dcd9b95db73efcb0dd427d287d297e4f3e1fda0079087ad641fa9e196a6ec7fdc4cc
+EBUILD lesspipe-1.83.ebuild 1107 BLAKE2B bc5a74041c57b9f4a3f811e281ebeebf9cdd77830821171c8a0f52746f61851882c8ce85b19934c92608b83eea9cc1365a7e496d66cc0131a14e43d4e79d04f6 SHA512 2a46c54733ec6c02a558d9c56d0327f285d8cca8db0e28bae5bd902d1c457a7d464e19de487468977297b14a7edf033d89e24d7f734c76f0a7647c28d6181199
+EBUILD lesspipe-1.84.ebuild 1103 BLAKE2B 825b41e49c49b1dd70a2892c41e7039d5bf70f65cfec0297e54f7abed327950d977e9a637fe17585b645e80e2c4f245aa5dd020759bfd8cf8d91e3bd46facac6 SHA512 a0e0f6813cfb27868641ca42e9a0327054efa92ed1c060b7c31fae406689616c873a3473e1e0127f78465286aa6185953a32a9131f083a38bc2c1291bf00ebfb
 MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
index 9664f1de12e8..cd9ccf523afa 100644
--- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
index 7ef07ab95e0e..3e31b8755cbe 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.84.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
index 30ad4194969a..6d1b0a34f4c1 100644
--- a/app-text/lesspipe/lesspipe-1.84.ebuild
+++ b/app-text/lesspipe/lesspipe-1.84.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index ee221c059b88..f0b7813c9bac 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,4 +1,5 @@
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
+EBUILD libetonyek-0.1.9-r1.ebuild 1347 BLAKE2B 0c0dc3a26076eb3b3d98f54c50aacd261bd7f13152fea89e37a04e53a37c8c37537d14a7f074d4a2ce39def6d77ac5226e86d7731798959e70c6ccd0a761737d SHA512 46ce7f286673f1c201cfb882130eb3d83c6a1c47a9bd3a28f72aeb5f22e25a88c6aa377a7808f1a129fd7223d73899a1520a3e6d23ed167cf7f854bf65082499
 EBUILD libetonyek-0.1.9.ebuild 1213 BLAKE2B dd541c95dc2422f4c0461627b79f27e053bc4616223cd924c545f26a9af8b2e5fba66f6aed8a30d61885adc7d00524511c55eae725463f091385a801e2959fc3 SHA512 f79eef907d1889f71a6c3377a3452c626758301e288addb84dd866df8d0b672214f3bd400598aa9f4037f8ae16bac54722008be056ee2611eaccc20e653b6ae9
-EBUILD libetonyek-9999.ebuild 1346 BLAKE2B b91113601d4561393b9dbe5e00a1bb5a85293d2e52b5453638a2075a01c3ac8d13ceb6c497f767a54a6bae021e03e375fb5013852b8d198c27929d92ae5dff68 SHA512 357978af52920775af2d1417df82aaabcf73e42e6cc9f5a8ca6ded6b6198fd01d4140ac07358518643d4df26de5ce8678984d83d246868b08283d400aeb598db
+EBUILD libetonyek-9999.ebuild 1347 BLAKE2B 0c0dc3a26076eb3b3d98f54c50aacd261bd7f13152fea89e37a04e53a37c8c37537d14a7f074d4a2ce39def6d77ac5226e86d7731798959e70c6ccd0a761737d SHA512 46ce7f286673f1c201cfb882130eb3d83c6a1c47a9bd3a28f72aeb5f22e25a88c6aa377a7808f1a129fd7223d73899a1520a3e6d23ed167cf7f854bf65082499
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
new file mode 100644
index 000000000000..63aab3eb452b
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.9-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	>=dev-util/mdds-1.4.3:1=
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	media-libs/glm
+	sys-devel/libtool
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+	if has_version ">=dev-util/mdds-1.5"; then
+		myeconfargs+=( --with-mdds=1.5 )
+	else
+		myeconfargs+=( --with-mdds=1.4 )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index a545cc94cd23..63aab3eb452b 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
 	inherit autotools git-r3
 else
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index 48625b97f84a..b5167b5bec1b 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,3 +1,3 @@
 DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
-EBUILD libexttextcat-3.4.5.ebuild 628 BLAKE2B 2f25bcba05546ee0d59b7917a521519014c02995c8bc263f0c4e5e477a7ccd620dc9c624ffc01e082d9ab7ad467bcc2fbc0ec7730900b40052b60951ea01d59f SHA512 2ca9a5bc42872b69aae267d2af6674206d3daaa65898e16b7b1c0801127412340b7dca78f5d6499e1cdd85908644220e150c85ecba13609ef6bc1257a91bd098
+EBUILD libexttextcat-3.4.5.ebuild 629 BLAKE2B a5a260363fe549b7dd122b4f5b5b8d8cd36fedd2e04c6bf5eb0d42bb56e2ba8a68344471bfef9dfb6ffd7239614aa1ce9ae48adae4d620ddfa2ef7ffe613adda SHA512 580ff1572a4a51218eac3ceafc4a038919c84a7d25d35d1055e7f7052311c9d12cad6ca2a3c3e210167b2fe941d94673cfa1ba2041339328308b41ec6d05dd43
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index fccb216b1e61..3d87351fa22c 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index 5e4c6e9159f0..16ac49149df3 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,3 +1,3 @@
 DIST libgxps-0.3.1.tar.xz 93132 BLAKE2B 63af298ef1dc345ef7c40fae4006ba73aa7529381cc6cbc8cf86f4d5b69c8c5617b902bef833ed7d3fa968d927b441e888889179f598b06e2ca13084d3b199af SHA512 80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239
-EBUILD libgxps-0.3.1.ebuild 1222 BLAKE2B ca09f6270335e779c1414429eb4f9f243f928a7c96abbddb9af9222b5c5adbb6324e97058cd01d8a8e30c3a20a568a8e9bf8e4ff3a09dcbb73ed7cb58d503b51 SHA512 60de2a5d9e3c55c99e7ed528468a19b15e8e15d84dd613d6ee02b140457ff3ab8de9fe21c7d4b9bc788a87bb8f74466a8fa03494c52352f6f567fa0c04b5769f
+EBUILD libgxps-0.3.1.ebuild 1223 BLAKE2B b80393ea587682f60e9f76f1e953dabd8a8589b51e302a71ea8d341be8df4d125485aa8f0b672b4ec94eae9a89b8426f165b1c02b406d12a60efcb4733da2878 SHA512 eb5351ef6f8e40e7b9d27b532966f53d655f84ca992769712fe05aa698974b55d32033ef2c2bf7f1b8fb3c215145f18a77be8b1fcca45a78522a12323dac914a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild
index 8dccec61cd7e..f6787ca4794b 100644
--- a/app-text/libgxps/libgxps-0.3.1.ebuild
+++ b/app-text/libgxps/libgxps-0.3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="gtk-doc +introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 880435924803..6cf0bf70fa4e 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,5 +1,3 @@
-DIST liblangtag-0.6.2.tar.bz2 766080 BLAKE2B e19599cb6445e40d21d4aec394ab3bcfe447badf096e8efd6e13caa48ce5cec832cb853f4924ce0204a747949506b49b05c175c2726fa3904424cc25b8dc9869 SHA512 812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f
 DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf
-EBUILD liblangtag-0.6.2.ebuild 1167 BLAKE2B 0cd2f99c26673b08b7dcf5ba0a9f71cbe12a78719f8c87576682f0fd143739544e3c71c4b443d8c0897197ee51e3a230e7f5767c0225313d4ca8668ee1ba3871 SHA512 778bf3785e772763424643a4d48cfb9227bf0e587800b490d6517db67101b5e58d20099317dc61ab8becbac8232578c4772869568d2480fbe20dd11b8b5975a1
 EBUILD liblangtag-0.6.3.ebuild 1229 BLAKE2B 63cef5c98f492b721bbab859090cabd3e99350e2788319dea9c5697aa774914365f0cad5290bb0d276633561f8445c55a1c5289c63ab68f9cda7afaee9259128 SHA512 55b99a2660b0550c34b48283c696a409c2f461d20bba68416e1ed63f51a8fa510a5539bd13dbe26fd02a0e838dc99fafee9e3ccccc84cf39ed7e12768aafe8bf
 MISC metadata.xml 349 BLAKE2B 3be7ff388f2fa95c460c034408fb159d9f7f2b17b4634027f73870018e672f330b3b0f9cc96fa372170bf2daa314cb087a9cd5794ab1e373449b4cc0762bda87 SHA512 dc4a715ede23108572522e1e6c7afd36b3c3359fe4145e5a02b45e7fc094f1633fbfcdf0d9c75955f75acb1487e438bb437a85766d7a06e628674447d5cf3d96
diff --git a/app-text/liblangtag/liblangtag-0.6.2.ebuild b/app-text/liblangtag/liblangtag-0.6.2.ebuild
deleted file mode 100644
index 63fe77c85445..000000000000
--- a/app-text/liblangtag/liblangtag-0.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils ltprune xdg-utils
-
-DESCRIPTION="An interface library to access tags for identifying languages"
-HOMEPAGE="https://tagoh.bitbucket.org/liblangtag/"
-SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="|| ( LGPL-3 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="debug doc introspection static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	introspection? ( dev-libs/gobject-introspection )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection-common )
-	test? ( dev-libs/check )
-"
-
-# Upstream expect liblangtag to be installed when one runs tests...
-RESTRICT="test"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	if [[ -d docs/html ]]; then
-		rm -r docs/html || die "Failed to remove existing gtk-doc"
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		$(use_enable static-libs static) \
-		$(use_enable test)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 49a3fc1d23c4..e63d37597699 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,6 @@
 DIST libmwaw-0.3.15.tar.xz 1289744 BLAKE2B 9aed923542e795904761e4969299785906aa65c735541788d91eb41e80420ac6c6df4df5e0cfa156c71d4e100c601e5e984de10c6a5f66eebe6ffb5f0374cc1d SHA512 0b2443fc6bc9da9247f7585743424df440f89317af989018d8b972864bf91e3c5cd78c39094a45d9de8114906b2b2a93f68ddb967af8565e4b499f643d86e682
+DIST libmwaw-0.3.16.tar.xz 1306872 BLAKE2B 29c39ddb2cfe63116cbe7152a4dc3b7f16d402745c0dffd67c07dc42fa1ddee71f391695ead2519b3e1da206e8f437fbd24fa78ce1decfaa55e38a13d5d144e8 SHA512 c043d77e4b0efd7da594c1e370f24ee2d85afcb8a5e28179b4c3d76c8b7925f41ca5361bee12b35af732ef39f34fac46aa3636cb27c179ef9bb2b6feeaa19b0a
 EBUILD libmwaw-0.3.15.ebuild 1024 BLAKE2B b83e05b736486bae6f4baf0f2f4f0fd5bbbb831f85b671e438d339739ef270cd8cd2d7237302e97d2eefad7016ed06439bfbde6e79a4cc5e50ed35f2e9c138e7 SHA512 35756c8f95801ee8a6f424ac812b182ff5dd12196e38bab7c162a2bfb0f2a43259bf00cc70df800f7b4699aa7f8be2ec64b1ebd1653c717fe0dc3ba407e032fe
+EBUILD libmwaw-0.3.16.ebuild 1035 BLAKE2B 63446225d716fbc31ad10ea9a53152afd169aab929e6e238a42ad9b038c243e11ed5d8cdfd8a133e81e63b02ffc313365fdfe9855947bb3e21ad0f94c4724e4d SHA512 c7cade36b3766e3281f51b7fe958a05f440a3856d6ace494deef6bf035b66f7603ceda5ae0d176a70e28d8130534f690c1562207eb610518c49a454cda2e9e4e
 EBUILD libmwaw-9999.ebuild 1027 BLAKE2B e51984196fe26cf9e7ba8ebe2e6de35c58443d3db82a65ee5d0358ac05f7905227670e05106e89d52ecb264f1e3833fe38917fce36a1fb6a2449228d90409d82 SHA512 9b530edcb03829b26715e09c5b99dc5f08bda876317813bf4589a7366a4bf20c5e2f0604792d103d6f50f2f7c4439a19dc60e362bef8627026508910eabf7837
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.16.ebuild b/app-text/libmwaw/libmwaw-0.3.16.ebuild
new file mode 100644
index 000000000000..f4561cebf565
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.16.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 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 static-libs 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-werror
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index a695ead8b1c4..520b0b96e4f9 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
-DIST libpaper_1.1.24.tar.gz 355272 BLAKE2B 28617744c7361a5d51bad3eda876b3a2c03e5aad0b381aeae037a7280c88dde7cf3c3a457e7aed2dbd86b116ae6ce2469f65edc0eedbb0c2df68451813a5a579 SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b
-EBUILD libpaper-1.1.24-r2.ebuild 1155 BLAKE2B c96c8325235ebc586bd6a95979586c5dafa370c976432830493026386c2e1c68a2677d24e21a86672726be1fe6eac26d576e0171c63c5a7e7c8b94e21d99be29 SHA512 dd4e52f93d8879a955b999087744259538012c8680abcb1e2dfe369b085e014e87b5c21b5d12d1083932acd47e56a895d85937424b9845c0cad116a7ccb9498f
-EBUILD libpaper-1.1.24_p5.ebuild 1212 BLAKE2B 1e24d41a68e975205336d24213cc2854236affbca09049ec36a0d3423122d9cb78bd19028f9ce94a49281c252c8c8dbe3d988869d111c1c69836fed573c1dafa SHA512 e3d71e08a0080e7379b5436fbdf67f659998b8ea37f3a5718ff59f54e524c16f02ce4b457946ed5d6a8bafc3395a79f941a43a0af6183242d58e534b641b01c4
+DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
+EBUILD libpaper-1.1.24_p5.ebuild 1208 BLAKE2B 3385089708c9da27b395939a0bb6cf976615580b873fefedbe91faa90d9a87be3e345b6628cde79b853de4f915682c0bbef822de3038e973b08222b1919280cb SHA512 d42a450b16c40e83e2a60f74838a977573986eccb663ca5c4ccbc7d95b08cbbc2695c79cac3ef00c2aec80ab7b35e06cbe50d65d405a7c7cccad21a8ea601c6a
+EBUILD libpaper-1.1.28.ebuild 1153 BLAKE2B c8e81152bafe91624ef95ef562cbbf03df5a3439b6992a888a03cf016e1bd5e6af36cdd646f7983ffad3ac20b997978ccc5849fc75145e421751f7675291e612 SHA512 6bfd5dcb4cd6eb4bc7742bc1ad87932ee1cd891674ec59c495c6338e9b1a7818f8eaa583a58b8c0ad322ec415f25ebedf168c7b18103f3e125a72d8269603b41
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index f3674246298b..27d89f1aae7f 100644
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -7,12 +7,12 @@ inherit autotools multilib-minimal
 
 MY_PV=${PV/_p/+nmu}
 DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
+HOMEPAGE="https://packages.debian.org/unstable/source/libpaper"
 SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libpaper/libpaper-1.1.24-r2.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
index 47e01e776344..72c0661922cf 100644
--- a/app-text/libpaper/libpaper-1.1.24-r2.ebuild
+++ b/app-text/libpaper/libpaper-1.1.28.ebuild
@@ -1,27 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools ltprune multilib-minimal
+inherit autotools multilib-minimal
 
-MY_PV=${PV/_p/+nmu}
 DESCRIPTION="Library for handling paper characteristics"
-HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
-SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
+HOMEPAGE="https://packages.debian.org/unstable/source/libpaper"
+SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}/${PN}-${MY_PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( README ChangeLog debian/changelog )
 
 src_prepare() {
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
 	eautoreconf
+	default
 }
 
 multilib_src_configure() {
@@ -30,7 +27,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
 	einstalldocs
 
 	dodir /etc
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 8b025ca1a83e..2943e88ee33e 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,4 +1,4 @@
 AUX libspectre-0.2.0-interix.patch 728 BLAKE2B 5954fa18e92c33f086e3cd45b1d837aa1dcebdef21f595ddaa7f3485bd02f563eafdfd8c0e541cf782875de2818aa91d07e2c1d377457197760095da0e69a7c2 SHA512 d5b35ea095175a3f51553e3bed6e0e02bf7396b036923660d2ea6cd73241ef6d84a8dac977c9ce38078d41b99aadc203e13853d7087624a43f2a3eae35fedb8c
 DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
-EBUILD libspectre-0.2.8.ebuild 1088 BLAKE2B f2f4600baeb646e0a8bf7526528cba3aa62ad788580bb9740900ecb9b90eca53158e1a5f24795bc6d84c97f6291709821ba1f25949870c8c665aeeeff4c6792b SHA512 a73028bbd2fb84a040c091ecca87afaf139cdde2098ea38a214838f3f23c5c0b6b0dba01d0196658e5efd18588ca0aaa5efafeac39bcfc9cee9a1d8ef40e4497
+EBUILD libspectre-0.2.8.ebuild 1089 BLAKE2B ee022b1c6cb7ca03c227c14a230e2275c07ef04c68fa58e140d250a2280d344949f8f2d1afed6ac78a12e9fa622ab34878dc017a647ef2bc89e8bdb8b97461f0 SHA512 c610aaca45b156d883188f1fc661cf0972d9fbba3bbac5c2535ed41c9692713d49a6691410d4d0e4ca44c6fe987a2d04d81d459ecf7b1d90e9e06f92acc4f9c1
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
index 8d3e14e106a9..0de9370f91ef 100644
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ b/app-text/libspectre/libspectre-0.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc static-libs"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.62"
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index ed6be73c8026..282d338908f8 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,4 +1,6 @@
 DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
+DIST libstaroffice-0.0.7.tar.xz 707920 BLAKE2B f06786f600414a086f9b08b413ef1e028b15070ce90b4be03b18dd69787f4812b4ecbc245381e0ed464fabe0c1147149a3c4df248181b236e5d8bb766b398985 SHA512 fae873457a8018c1613667aa92771981503585513ab01bdbd2dd6d506ed4f72a7a8fdcfcb8953a46dfcb8fd902d2c9ef8ccd1a5ff15c83990a89847fb98009f8
 EBUILD libstaroffice-0.0.6.ebuild 939 BLAKE2B 0c15a6739fd974981ea96eca622e2b5f4a9c92a5b26cb59c6f9f0003fc7746d004443887b93770a24a46c1b2af50e0aefa93895c10d9b0aaf10021329f0d059a SHA512 c5ac1dababb01bfd8c208ba686dff5d9745c57923550e780a0970b2c8cdc2bc2b4382085f0be2eec9ba5cdfa4adf8a182f810a4db3d8a586e2fe873bb696ee55
-EBUILD libstaroffice-9999.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
+EBUILD libstaroffice-0.0.7.ebuild 970 BLAKE2B 8a0c15fbed015a4fcf3486377a283d5de02b90dc9c6004a0cc6385cdc1ca1fc12ce40623b0c761a2f008355a912dbc5c389744c99cefdd4014aa624dcfda7b8c SHA512 beceac819018586c88d9c29869486b0307b9ad52d62539f2bf5fa1ae47cbf70d6b5a62c26085c33a19107139ae956eff80c8ec1f883ce304834c778117687537
+EBUILD libstaroffice-9999.ebuild 948 BLAKE2B e587d8cb4ce451cd83e8890e03b797087cf097b5d1a337ce47cc5b17a003bea0547a187d759545b2c825422549fc781931ac19099d1bac28d754735039b3b8cd SHA512 e75eead560e819a37f4a3f0df4fc9d048ae6c53d291fa79687f3175ffb14b2112e8e4017aff581a1c2a482342e52c5c61d559589acd29e5e258757de11b6670b
 MISC metadata.xml 469 BLAKE2B a9dad122953621001465506893edb9b72c1b1e7a213f0cfbf155a985595d7d319041d95030ea80411a6c21c97aea0a2aa891538f26f31f46cfc4ac6ceb75d183 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.7.ebuild b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
new file mode 100644
index 000000000000..e56e6857509e
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/fosnola/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Import filter for old StarOffice documents"
+HOMEPAGE="https://github.com/fosnola/libstaroffice"
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+SLOT="0"
+IUSE="debug doc tools +zlib"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-libs/librevenge
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable tools)
+		$(use_enable zlib zip)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libstaroffice/libstaroffice-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild
index 7578276aed40..22578cbcb776 100644
--- a/app-text/libstaroffice/libstaroffice-9999.ebuild
+++ b/app-text/libstaroffice/libstaroffice-9999.ebuild
@@ -1,45 +1,48 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
-[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
 
 DESCRIPTION="Import filter for old StarOffice documents"
 HOMEPAGE="https://github.com/fosnola/libstaroffice"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
 IUSE="debug doc tools +zlib"
 
-RDEPEND="
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
 	dev-libs/librevenge
 	zlib? ( sys-libs/zlib )
 "
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable tools) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable tools)
 		$(use_enable zlib zip)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index daa10db42b50..b31915826328 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,3 +1,5 @@
 DIST libwps-0.4.10.tar.xz 695448 BLAKE2B ec26b6ccd918aa29d0df053b3e321b651e0c7142910009e0b50a89f88f4dba8f7e9e20f8962a7afb84497b533129d85eb5c7628aa7c64f2a57ce2976d5ff372f SHA512 e5a6155d9e59df226e72db5723ae7574d3f3fdc49bd64156e11f9d3715748fb919dd3d2ab83b6d5fb80c002e7d4ca12563f6ff80472a6485f374b037404acf83
+DIST libwps-0.4.11.tar.xz 706000 BLAKE2B e733b2fed9a05352b41126b2c0225807b3fe9a57f01f3b2a3bf35f99bd0adbd47bab8ef058f45de749332d407d589f6c33a03a3579fc76551548cb92c236e09f SHA512 6c81342b68fd93974c10ec0907dd46e9417cafa46d06205843941650828f4299a8793a7ace5c0ca755b8b9fb91fc1d6ef63304c641e7b5de36885e9995566e36
 EBUILD libwps-0.4.10.ebuild 739 BLAKE2B 424f86cd3bef154f0221e14b568603c0578b298032fab736d2ffda545a5c26f132d96fb4ba11516b0c839669d54f3103ddb5f13854b485109e8897e1573203a1 SHA512 dfe7e90260e69078903641bb058081e0cda277d9507a8eb5d885fddf82e5c571c4b956b99e26ebf20cd2656c981c18f7f9c6cc108aee73543a5fd8532a1ea88f
+EBUILD libwps-0.4.11.ebuild 785 BLAKE2B 0cb03b63c0d1777f3ea9325ae2b837268cb12be826bdc8d864b600328f6cba8bac2f8e31889a6c990036e26d8d24c75cc34ec5ef760cce9ad69053aa5719c365 SHA512 1b617c24b3a5046de8a94bcdecae5ac738b1fcf75776d4589bea88336dfd1b2b4a24df1bb3a2fe37894611f3a28d8f5635245ecc3ab76021f8f3e2a6bac765e5
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.11.ebuild b/app-text/libwps/libwps-0.4.11.ebuild
new file mode 100644
index 000000000000..ea494a549900
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug doc static-libs tools"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-libs/librevenge
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with doc docs)
+		$(use_enable static-libs static)
+		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index 05393274b903..c2b5ea2e433d 100644
--- a/app-text/lv/Manifest
+++ b/app-text/lv/Manifest
@@ -3,5 +3,5 @@ AUX lv-headers.patch 725 BLAKE2B 64a570d256aae0e5d3c13c2c6a51c2311da1dff3057219f
 AUX lv-tinfo.patch 629 BLAKE2B 1923de4cb256d6752561f2489d1633a01987e4ad073bd28fcafcd2ab81c68a2ea8a4a278a0c4a8c1c09df581f0391fb2c469c65144ddf5d7975ba1b8b9ae5555 SHA512 3a33edf5ad11d77cd23bd27fbe071aacf83ec5367b100103954159a0dc4ba2856f3978d3b8c7f41c52006dc99097bdd9d127419f700d75cbb88b745ffe4694e0
 AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654eac86948b7f0e57397af96beca2eeacf259f9258aafa5d03303a202ab5562236ba05f0adf22cfa7 SHA512 eb791a2e392070a01e372bbc6d0d4bc113fbb57394e50fb7a55e46ee4b0896177fdb1698db750b43e78b6aa120d0fef34ad4859fee5d4a1749c062a7afb6ec84
 DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
-EBUILD lv-4.51-r4.ebuild 985 BLAKE2B 23983977e2f6b14333042936b94490b3145a7dbb9f235b4c3ad15237e283f67015409f7fe82d790f1f55baf2a1d05a93626360e34cf8a8f73b907238a3873c74 SHA512 82566cc1354dc0792acb32b6c6aecaaae8f67c562d26194d3e59bcdfa11271733fc52232de65f63762ccbb5b95c302f43627a7d51d175286d0fdbc9849d5ea99
+EBUILD lv-4.51-r4.ebuild 983 BLAKE2B 5b4fed1290923c58644aebe7b148f95acc4c02288c688f7127e1805d088a28533f80efd98fe7a02cf96e1c27f14629b4d835c5e90f81c2c91e8f2b4431f9f0a6 SHA512 5f7829327895e7681c91b35caaf2d42fc748adc1d3788f4363939e205b959b561ae57493416c548621e761716393e86b2dd1df0f2b649c2e43bfce1cdd8d3228
 MISC metadata.xml 358 BLAKE2B 56858cc481cec55add44dce0a02d0955fa787248b0a6861914fc450957d9b18ae256a698613d94479aca810cae4c264e0a91bf3ff89b52183c4945ce32a5dec5 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
index e70e508e42af..065e2cd8201a 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="!app-editors/levee
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 585a77154a4e..81247b44665d 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 657 BLAKE2B e00dca0bea0164f497a421a45ee6fdf9f569ab25eb1ec40d32e897e9d10a17c668d4ff3058812e267ae9944538defb7ba52790d71869259a728a955f61f54bb2 SHA512 8556d63310719ff04202e742bc8d9bbe0edfa297b54b052f10c12c58a3aa9acf867e0d7952686a3c1257bc84d94e9378e4348465648e0f5bba79b185499242c8
+EBUILD manpager-1.ebuild 655 BLAKE2B 96ec86a75feaade10fb6bc00488a2f06f4450f09cccfa88661fda4bdaf5fabe25e426563c40a39e57202242dc0ffed442140e598cab3614624266cead1755c0a SHA512 4cc9d895f9868a95757ce2bafd5c9a4f77c4383fc7824890dee2368ea10df1b2c50c732782dbd692688bce666d71d4cefd11679f194165ade782f16871e13e18
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 1b22d1a0fea3..b1fbf45d47bd 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 75b734de1441..80582c3677a7 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996-r1.ebuild 1162 BLAKE2B 80faeb4af9ffd68c6182c10fda7bf3fc9b9c3a03fbd80811f821d692a79542e48997890328e567630aa4f69ce49b2e98007178629b8039d6ac464b8d5742b886 SHA512 d6b139c0793ae459cbd3855f1b6c645b260a9dc9d0b79a5325a47e46b745e2749ef5249afba3bd57e3098a1f95ce5d5f995b42278574c94af75876f39092d332
+EBUILD mecab-0.996-r1.ebuild 1163 BLAKE2B a9367c9d3ab6426002c6af10b52685386ee29734c87c7b86b5b0b05524216c3bfc0c0057a6009a3d593a506a9464eb66633ce57b435f081cac4792ef360fa45b SHA512 52f9a2a2fa689e5bc2491ac68e1ad086fcdcd3b9b00c21a8266de968829e3790226e09dc56c1c235a5b648c21dd66888c3f21d0c2b0a735c7906d05f6fe1c25f
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index cacc5fa860c4..1e07ac73834f 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://taku910.github.io/mecab/"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="static-libs unicode"
 
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 101f28a46fa7..42c23ecd1dff 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,6 +1,6 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
 DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.1.ebuild 1278 BLAKE2B abe03651f6098d9374f33299de56e25749e5865bd9408f8dcebdbc50ae4f5d81f7ed046241c5c4818ffd082b2ce6c88cd4f721f80400f02e8f5af2736b7c5db6 SHA512 3816da3c15569425b5aed28e15bffacd196469b90d1e40cda37471023c95187de85fb9d24308b65676deb61780e3b80289338fb85a2f17d41d09729670fc67ba
+EBUILD multitail-6.4.1.ebuild 1279 BLAKE2B 03b0022e5d7c0e9ede138abe5393646feed9da09d7eb27ff9373d6c38b3b762ac45c37d05c60217c72373ece3dbb7a624b17090edec4a9c0964ae0b1e4f75392 SHA512 9fc8bc426de8522afc3f5d681ab2a3bfaba24ff25ef553fac1c55b193ff087644fabb08fabdc014d127d7c2b54a312d15905dbc16f25202a04113c620fe031e1
 EBUILD multitail-6.4.2.ebuild 1284 BLAKE2B c336442cad722e0aee03c97e43b3e9b4c51146afa4b704387f417c27cfd43459fea7ce5edad9058f319d4544c30af36c5b8ac973cab4990a19794708cea1d9bf SHA512 aacfeb85b96ff2a6b321019edf6427f61634bee087fa79103d2224424ef6f87bf1cd5a0181c886abca2f63eeade937d87feca9709b484dbe870b9c6cd60296d7
 MISC metadata.xml 272 BLAKE2B 609c633a45e8ff00773488f8866b7db5928c91bb7d81172a893fee6ac47f1125ddad1c15a59e3c337d57612112ab6c4731669e31ea4690c8097e6a4602019d5b SHA512 d36a244fa048a320eecd4da6ab2b4a65287a32ef24a253e028b5f95d4abeb7fd935b466cbe02f29a8e83d4c0cd3d1109de7c8d9b0799fa45273b0fb695bc37f7
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
index 2c67a1735992..4bf7e87f111d 100644
--- a/app-text/multitail/multitail-6.4.1.ebuild
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 
 RDEPEND="
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 050cd6aaf4d2..2d6d93558c03 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -5,5 +5,5 @@ AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5
 AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
 AUX mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
-EBUILD mupdf-1.16.1.ebuild 3481 BLAKE2B e5fce8fe9b26ac0258a67ec267a416cc6b99fd5bb2147a63ef27c56344f56d92d531682a6e070a95870d73168e8dd715f4552044c968cc1b39d7de2d7409a3c9 SHA512 9c9329fc73b52aa5c154463fac09082ff6b11063a1496d092466a9ccbc71c7d43ce07b7f6d5a38d4eff67ce1878f54e5b3c3df82915575eb67b4497900ae191e
+EBUILD mupdf-1.16.1.ebuild 3482 BLAKE2B 2f8f19e665bb7f60a55f08fd841a05e2f5388831d1eeb7bf903bc2014d2723c93bc363fb4930295d54b932e42ec0ef05dc966e5b64cc1c9af0e89727251d84c1 SHA512 90b0634cd1ee1c29c6dc91e563c26f24736429c7be164855df4ece40967ca6b5e1af2d10e5743bcb83e05aed607ffb771115960bb7c299696ec796fb4704e211
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild
index 72d1db2495d1..d93fa2a0f2ed 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
index 9199910543d7..6f98adfe2a54 100644
--- a/app-text/mythes/Manifest
+++ b/app-text/mythes/Manifest
@@ -1,3 +1,3 @@
 DIST mythes-1.2.4.tar.gz 4910303 BLAKE2B aa091344aebd117618d90aa574ec5e68594782511e1aa85a2d46740ecc4ff2cdf1d9f9f6de9dfd454cc0056076bdb9a21ad14d2935e39e4fdbd7753930fda605 SHA512 a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21
-EBUILD mythes-1.2.4.ebuild 586 BLAKE2B 2ee213b098535482158ef4923a0a0d6ac5f7b15f408aec6b2bf01cbd34ef43d0894fbbbea6ba529d2b89cced828b400cca7e64d671df2afd16dea11c3ce94489 SHA512 0888b8c385ebb826202f1ad565d58cd62745030e6fa068b1d6836391a80ca6edc60020996109c5145e233ecd66798370d268ad5221ad67d216c1dd6a10ce886c
+EBUILD mythes-1.2.4.ebuild 593 BLAKE2B 9067dab7567cd6c816fe3abdb6ab6f1662a532c367dd4dd66a4905d00d9bb9d9d7be5d1706ecf492b8ee6a9ad917b0bdf5836ded5d324217b4942bc09a1b79ef SHA512 7991350823617b0a79698672629e475c740d959d9993d0adc942c40d6d4b05dc9a9194695c20de2044673655fec3d5920b7ca3ba927cd37444fb153a17f6f84d
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/app-text/mythes/mythes-1.2.4.ebuild b/app-text/mythes/mythes-1.2.4.ebuild
index 9d0fe705e834..d6666c736949 100644
--- a/app-text/mythes/mythes-1.2.4.ebuild
+++ b/app-text/mythes/mythes-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index 856068c0104d..152f25ced7f4 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -1,3 +1,5 @@
 DIST nuspell-3.0.0.tar.gz 403043 BLAKE2B b437012e4fb327f13d9ff0944dadf7e865c670daf153be00dd48e9d2fc01c87d410ebd5aeaa094f6446d3035346738010cdba961cfaada3751bedce264beaa6a SHA512 d9cd7dd276e2bca43dec3abaf11c5206695949b9fda8c9b86f2772cc7e8fa95bf17c685a2ef9ca87fe3c4f0b55f2fcb435bc21c187355f5e3fa35dcafab2c8c2
+DIST nuspell-3.1.0.tar.gz 407196 BLAKE2B 688f6f59ba2f7bceaafe9a7cc707c008be93341e855ca60f07d6de67a626539693048af6f5ca40246ccc51e2573b76ba2bd4439aa9c0acb66a212bebd9219617 SHA512 a9bedfd6e2d77fd34d249cf7aa1fcb6bde5bced26f02f8a2dd860416a61488c9b7016a0df6015052fcccb272b342e6205db601107f46efa44c9d78ce261a826c
 EBUILD nuspell-3.0.0.ebuild 1091 BLAKE2B 07c8fa7a2b9c03c18821ccd35bc1d9fa5f72490c4a9ec4d52cd4f4f90cb2d295771e2110b6ab50ab8c0bb34db075349735993e61f3d5ddca1380d5cec4e467f8 SHA512 eceed5f031c930296ed451dad77718cd07e4b052598026b4c59219467eb26c7eb050239d1869339791bd9e4bf437af9e54cefa1981ffe939394331a5dde8adff
+EBUILD nuspell-3.1.0.ebuild 1152 BLAKE2B 0ab1b278f6423bcb16a3133fb7c2223bdd654e2757a15d606100794459c411e1703b0426f28edec6b32d767ad4c7071e6b4db5e0c6b1f2e0fab0085cb96cf671 SHA512 ef38093ed47b99964a263505cf3374e4390830b482464082154358c860e47988fb076da79304ad540121424e1f7345652f9f646ed595502fdea364fc833064e2
 MISC metadata.xml 489 BLAKE2B 51835316b4f8b1b1a016324955d48f6f5126ef7b7caf11f4b46ea858469fc9ebe3154de4fbc99d528bfef3808fe7c95dd2f540038572ae640b00dad9fccbeacf SHA512 ea959020e4b2a90f475d296fd1a43c2ba8efc1c39f2dde70b930165bce165df1011e04af8f54b37740f28e009502a5c64ec0fdb2b7221003388cd47b1ccadeb5
diff --git a/app-text/nuspell/nuspell-3.1.0.ebuild b/app-text/nuspell/nuspell-3.1.0.ebuild
new file mode 100644
index 000000000000..84d7b5101d04
--- /dev/null
+++ b/app-text/nuspell/nuspell-3.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="test? ( || ( MPL-1.1 GPL-2+ LGPL-2.1+ ) ) LGPL-3+"
+SLOT="0/3"  # due to libnuspell.so.3
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/icu"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ronn )
+	test? ( >=dev-cpp/catch-2.3.0:0 )
+	>=dev-libs/boost-1.62[icu]"
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	rm -R external || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+	einfo
+	einfo 'Besides MySpell dictionaries, for other options please'
+	einfo 'see https://nuspell.github.io/#languages-and-users .  Good luck!'
+	einfo
+}
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index eafacd7811d0..292e25fd886d 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -1,4 +1,4 @@
 AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762
 DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
-EBUILD odt2txt-0.5.ebuild 732 BLAKE2B b247856d1b4d4f232b27c76333e7052b13339ce22ba4ace264fdd57f46235cb55d532a139405c0e809459ada81863e243ca40ee0a71cbc2220c1581686fa44db SHA512 8650abf7b56f5f25559683cacc4b5f13fd1e41dc81fc2aa9141475cea6fcc765ecd39893ad5f23875cc337557320e325ed844381b6b9525072807e6fac698244
+EBUILD odt2txt-0.5.ebuild 733 BLAKE2B 5376feae769c364f9176d4a70a2d6d946206dd98bb86d1a0362c941a7f374b8f7d5da67ebbcae3c8662b98d1b2bbdebffe5aa3eb4e1b6808ce08158e5da788c6 SHA512 ffdfcca2ffaf7a2cea9b6cbff24cc455e73e6a61f330cc10c8bcb3515506cf5c0bfbb60f4f565fbae1097b33579693c54228f6663d4f3ef85350140712ec16cd
 MISC metadata.xml 167 BLAKE2B ee34aa7c86910531f97e3ba5ec71670012761b3523ddf4e0e1fccb2134b6ddaabdc9329c3b45d697b4f745a707dd513f6b71a8cd32fb840a6b0b5af774ac0015 SHA512 bb251ebe24a6b0c9ff8ee0298e1aa3653443fc97bf44ff71ff56b88b82c36696a5db75c19cb345a1852e6a455874c603efff97b15799d7e8a224124a312df8b8
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
index d6bc2855fa59..d98a0992c75b 100644
--- a/app-text/odt2txt/odt2txt-0.5.ebuild
+++ b/app-text/odt2txt/odt2txt-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc64 ~sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc64 ~sparc x86 ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 563adbaa9a96..1c9375673dc5 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,5 +10,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r9.ebuild 4332 BLAKE2B 9f68e14c400143e0ed5ba1f4ae3f847fdc66f337405d9435222fb16782428e6eb8c29a7b7a8e58324f920f81c95583b78a5afd962f78c6b63837f9fb51d63740 SHA512 46fa3a2abc9b2691f032a93ff93a0075c0a1d4fcfac2d756e053dc98606b77885e45fe41187316f74edfc979e7d27b8e02b77083ec04173061f404955bd6b955
+EBUILD openjade-1.3.2-r9.ebuild 4330 BLAKE2B bb884ee77b2f4edf2b09a819ff3aa50aa1e70f261f27fa35372bcc43a07060d26065a25f1dda0db56b33869e469b78d4d77b962d6a33fd842fd54240e19d8f61 SHA512 27957cba561d08f2a73794fd296d954492b5fbd349d02d55c5f82ec9e3fe8872846c9f29e813550eb1633ea8a271f9a6acb740c79a2dd990acdad64ad295964e
 MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 90499b54db4a..4c5f6edcc6cc 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/openlp/Manifest b/app-text/openlp/Manifest
deleted file mode 100644
index 36984a6e021f..000000000000
--- a/app-text/openlp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX OpenLP-2.4.2-disable-tests.patch 795 BLAKE2B 0741116f289c1ec368e401d66a798f87124971c069921813f71518155e78f04b6fa097686899c809f8cab84084ab1fde2141d30ba74e4f940c2bd2647069c939 SHA512 ac67c675a4793be0194ccdc522737de0fd2b7b008707c19cfb5dd4fd1c17e88a59c0d38cdfebb02272774da81dbf06ca8b897504abe3d37b5eeaf40b8d0c63f9
-DIST OpenLP-2.4.6.tar.gz 7303683 BLAKE2B 4e5b1a60c8eb8772cdecf453e8277a69cfb1cdd51ab6478425332b58c52319713dd411027a108113485ee7fdc4c770cb6f94a626b23c6cca82231311a62df08a SHA512 071ca83c6969c5281213dea5efe6dfc60a3d22b56534b93e2fd1f8e43760ba5cab851b6f4dca485a31254d2090e26ce640359cb9f9797d84b9509426061dfb7a
-EBUILD openlp-2.4.6.ebuild 1185 BLAKE2B cd62e36a992c7d34a884d3e7f72e0e640de2a542d03acf9437d1683d2fa8cce5d7784a47aede5bc70105e90070e12955a37a08005666f2f369def233e8b9a341 SHA512 2e2fb23162c1850a09df2d1f1ba61ff338702a63ad2bdb179f5a5980c5a0340c806cef721f4867257c5471966593118d4fca928cf8a7774991c79dd0b73d9861
-MISC metadata.xml 243 BLAKE2B d538a563cab2fafd5f221d51aca0be85d290aa5e64dd6a2a1411eedb557a4014acd040859a18e9021cb33c978ad2028f4bad6f127714f3f410513b8e5ea5a600 SHA512 c2e42eb6d3044abae1cccd4fc2bfdc28d15223e2f1c4c5f365be504eac8a2db9862465d92a2ae5acd2d121a5dada77fa4724e3c24cd981a40e462435dd61eed2
diff --git a/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch b/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch
deleted file mode 100644
index 0b1de65e85af..000000000000
--- a/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN a/setup.cfg b/setup.cfg
---- a/setup.cfg	2016-06-25 13:20:56.000000000 -0500
-+++ b/setup.cfg	2016-09-08 22:30:54.606413547 -0500
-@@ -2,3 +2,5 @@
- exclude=resources.py,vlc.py
- max-line-length = 120
- ignore = E402
-+[install] 
-+install_scripts=/usr/bin
-\ No newline at end of file
-diff -urN a/setup.py b/setup.py
---- a/setup.py	2016-06-25 13:20:56.000000000 -0500
-+++ b/setup.py	2016-09-08 22:30:50.523413394 -0500
-@@ -157,7 +157,7 @@
-     author_email='raoulsnyman@openlp.org',
-     url='http://openlp.org/',
-     license='GNU General Public License',
--    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
-+    packages=find_packages(exclude=['ez_setup', 'examples', 'tests', 'tests.*']),
-     scripts=['openlp.py'],
-     include_package_data=True,
-     zip_safe=False,
diff --git a/app-text/openlp/metadata.xml b/app-text/openlp/metadata.xml
deleted file mode 100644
index b6f70e4456a8..000000000000
--- a/app-text/openlp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">openlp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/openlp/openlp-2.4.6.ebuild b/app-text/openlp/openlp-2.4.6.ebuild
deleted file mode 100644
index 49765ea89237..000000000000
--- a/app-text/openlp/openlp-2.4.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE='sqlite'
-
-inherit distutils-r1
-
-DESCRIPTION="Free church presentation software"
-HOMEPAGE="https://openlp.org/"
-SRC_URI="https://get.openlp.org/"${PV}"/OpenLP-"${PV}".tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/alembic[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/pyenchant-1.3[${PYTHON_USEDEP}]
-	dev-python/pyodbc
-	dev-python/PyQt5[multimedia,gui,network,svg,webkit,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.5[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy-migrate[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/OpenLP-${PV}
-
-PATCHES=( "${FILESDIR}"/OpenLP-2.4.2-disable-tests.patch )
-
-python_install_all() {
-	distutils-r1_python_install_all
-	domenu  resources/openlp.desktop
-	mv   "${D}"/usr/bin/openlp.py "${D}"/usr/bin/openlp
-	doicon -s scalable resources/images/openlp.svg
-}
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 0a5dfafaf42c..86eff534799b 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -2,6 +2,6 @@ AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd4608
 AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
-EBUILD opensp-1.5.2-r3.ebuild 2008 BLAKE2B 56057b7ce26232d36d414fa74a95c733e387dcdc0b3a45e316f038feaae0332e2b24ec97735896c3f9a6bb9e7c52fe363156b3af81c061d7bb909af8a08a3e12 SHA512 4321b74a7ae57c005e94a1e8c4e0b3f394e2915996ff72fedfc42fce64f6b3a85ca92e74544b50ee5b1d4b66530960a6c372279dc59dd866bcd9c44d50395f57
-EBUILD opensp-1.5.2-r6.ebuild 2087 BLAKE2B a2ea2a16407ba576ae1b279dd82d0c43b275e0ed170b22858aa77fb0b4da0a2eb2d316633328f3ae831daab445db4eb7110639a7920854f268419758e63369c6 SHA512 98feb4bc633e77c99a1bc420e8cb971b2719d4e54fbd0bd62782d1111e656b21bb333c511ebdc04cc2bf23fd3c4da62da973f35ef7d0b763e6c7ab113a8caa9b
+EBUILD opensp-1.5.2-r3.ebuild 2006 BLAKE2B 1626c458508e84e5d3ac1e6f2be8a0ee25fd5e69dcf843b1bfee5afabd3ab8dd415e897cd15dd99b37428b099ceacdf1abed2b9e19867737aa3dcf2a33f143dd SHA512 7b359c316bf2804a3361fee3cdb8a4e520c12ed56ba1983f8fe5cd67de255e7d8be530eab5611d8d0ee5e4c428f5b10c105164f19e317824b0395a4a17456ef8
+EBUILD opensp-1.5.2-r6.ebuild 2083 BLAKE2B 0b81f55f210161fa10460b5e1ab53e3ce49b8855ffdc23f7e378090d649134c5e45df0b46f9651eecbd464016d494727dd385be333d8e02922175808075b76f7 SHA512 c7871c02c1fb7fe8c6bd3845c53acfcd5295b755289b5f66f8ea6fb51615b48a3fb90b7a8dfd9da8a6473ccac3af4b35ec4f049f47470553a16d9de9657995d2
 MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index c6dfd3456cf9..b2e999ff0d57 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 0af226ca6882..f34b25fcdc5a 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_glibc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 021d2059587a..84502538a5f2 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,7 +1,3 @@
-DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
-DIST paperwork-backend-1.3.0.tar.gz 62119 BLAKE2B 0dcb4c4d3c96cef8ab993449da46a01168be0b1ade8bb56eada723f046a0b82eb9b8b7c15b7706ab8b6be8e22166e2e01082e57d85a68c5ca919a081ad67fade SHA512 127b71db39a54533f520bb6969a36c48b54827f5720efb40728b133d4362901cbe4a20aa84337c1e8262338ae528ed502c23fedee703898a53e08b3bd5dfd7e0
 DIST paperwork-backend-1.3.1.tar.gz 62343 BLAKE2B 2d391f63b0eaa010695b3c11b35a6c89df9df9f60d45401d8bad711743037379cdb856d8f6b0ba9f7837ac272c2d6fcbe6f58808d8b5047dccf210fbd9a3c98c SHA512 e845ddd4d01be0f4d89e7e4a0a728d06b90b87a551dca3a88426d1ce6487bc000676c997df73d13662ea8f93aced8e8dee8d44ed4fa588a4c8bd514135610c35
-EBUILD paperwork-backend-1.2.4.ebuild 860 BLAKE2B 9af4aeee426196a1ac3c58a048eab28bd4985cd02b50ba10edf5602ba0b7527f2a9d69c9dd481a61947aff927a59ff7a14b23113db20b5545e3204041acb3e47 SHA512 a7a405fdea6c2d22171d198f0591d7dca12882a0d6bbcea4c4bead5409ab37dd4dc00ffa87ddbc3f9208503d9782a6016910e5af0b5f14c5629cc4e21b20735f
-EBUILD paperwork-backend-1.3.0.ebuild 897 BLAKE2B e6a5cf5d5e85ae4db6f1d1b29924304e402d98f9bbec59c8f6b44f1f5fe10f0309361a109dff2e7400e7eccfacd5d5fc8dd5db15e04cdd88a06dfabf6035702c SHA512 2d894868be601eb565a3f567b966f861c32700e1cbbe41622fa6188b52b6b357ac6d9b665c51eb3cb09a64dd133d4977d26a4adb0c6a9612223f0520a7880d38
-EBUILD paperwork-backend-1.3.1.ebuild 897 BLAKE2B cbeb60d6e3d34907e0dbbe7a6c0e705417ea4f8b82b428376498f14dfffc48e25c83a660e3b68127ce95ce90da2dcf645853827075a7a3a73bfdd81d4eb75ab8 SHA512 98eb204890258600173d9fdb0400593b2759d70948c75714bd69071cde2606cccb28d381a9880f972aa0222b81ec2477bbfcdc3da46f59b32bc2713f2a4925b0
-MISC metadata.xml 415 BLAKE2B 3d7bb0d432b982a1c482119ffedbff65e938944bb771729e1c56cb801fd5c26286eba701eb7dbf54d682b2fc975bb8bcad32f38b27f93d8ed3dd403469a416c5 SHA512 aeff8f2d4565711d077d1d2a5105f6c87cb99fd37eb1daf7dd1e919e51b5a1309c974a9e7459b35c3334041ad9776b1ae291fc08b7f2fc0bffe8bb360e2f74c6
+EBUILD paperwork-backend-1.3.1.ebuild 891 BLAKE2B 85269451a3794fd104ad4d1d49743f8dcc994046f100e3a224e2f3f8b5b015a30b57e20080cc9da9171b7aa8fe28e7f1b605de7a5ef60f14fa7a43af2e64f00f SHA512 36db0d6d551119cd65b79874b55b2e44dc752e9bb207edd905794fd0b84c4bcf713f46e813b6c2bd0f4760cbc6ac1490df1e7a0ecfd12181ce2c2d3398cd43da
+MISC metadata.xml 342 BLAKE2B a73c59727e066a3ffa217b622c58343a42d34351791f6619aa94d1a659b9d43ccbdfc9682901fb074c876a3e66b19403c02657aac3956502f400a93bd73ba6b9 SHA512 5a3a63678f9d83107a83c1bc6e4181544627279e89b3b589fcd2b745221dddb0201779f7b8c3ec1d7b2812a92ec7ad8d290ba58c11860f46f3c5329840bf1730
diff --git a/app-text/paperwork-backend/metadata.xml b/app-text/paperwork-backend/metadata.xml
index a6369c9ecae4..0119fbc6c787 100644
--- a/app-text/paperwork-backend/metadata.xml
+++ b/app-text/paperwork-backend/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">paperwork-backend</remote-id>
-    <remote-id type="github">openpaperwork/paperwork-backend</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
deleted file mode 100644
index 0a832e42581e..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
deleted file mode 100644
index c49aa73fbd51..000000000000
--- a/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-text/poppler[introspection]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/natsort[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/whoosh[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild
index 3e203a399adb..ec1773147b20 100644
--- a/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
-HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 7442f6aa23c4..fe0d2ac2c6d4 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,7 +1,3 @@
-DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
-DIST paperwork-1.3.0.tar.gz 4625505 BLAKE2B 866a043216dd603fa4700ac09b998c55735e6a5fe09fc3ab02aeb6b68cc62f239e86f8116d84ae1571235e7d9230cbe25bb878909e3f7e542164d5f76440f367 SHA512 6f0b7b88d62520dd69fe8ee6a033a8cde9e48ba093ce7ec77df26549df29e7a0d8eb2bfef9f74e41a722cbd1d2d7693efbffa5327838708c9af54c76634b967e
 DIST paperwork-1.3.1.tar.gz 4631298 BLAKE2B 9b111c524da29c6d547141a64ff39a5c50f18375484ae60702a2c7ce57a7be51b62621cf114ffbfa9c2175f9978225525f321449a4a9cad2570cd26dd956e496 SHA512 a0e6a95ebd0b5bfc290b8981488967bb5f2198ac5ec768f824ed487648d0dea6abc3ab8b8cfd8107eac1223a5ecb351a5362d9cbd7d5efccf5cb8c9a318490bc
-EBUILD paperwork-1.2.4-r2.ebuild 964 BLAKE2B 26bad1bec6654b90751de1a1b24475c4a593d1f6dcb4b25f6800e60c78d24883b9093e0406a947f779feeba4923c83eb8c583194949ac9215c20ba85f61fc928 SHA512 d88dfe16b81eea0fafb90f978d66f3ea12cef061c17df64a700740052ec2ff39c21837526a55c80ba483f32fa692e5502bc1699a2974861eae6cb8429050104e
-EBUILD paperwork-1.3.0.ebuild 945 BLAKE2B 1b25bd7f29f84816f4e9cc7196f464143570ad8b26beb913bd3666d50b2ed2d14f295b7c084a697e0a6c69fa4a484f7705a19b7b8c4223f3f90ea2dfc2fc7d33 SHA512 2e88695f2c1f9f7b62f2b269a00ad29e9edae5f8de5137d08f98726f22a4c54f3eb0ab6fa80d5fe211afe5cd4a0db888cb0bd6587215127fdd6ccc81d4113d08
 EBUILD paperwork-1.3.1.ebuild 945 BLAKE2B be6e1ee7f52e5792795dc479f596010b938e07d3a976537e8cc0ebc9b257949bc8284da97db69805e48797bb5860f4dbb85d0db6f6bef2ae70bfa0f320cf45d5 SHA512 575611d921e7043243f43c9e6cc918f09c317cc3c99eca0075d7371d11b4f169bbc4a8fcb855670948816a63d68333397c7a0162095c0c2aa8350e2fed115bd2
-MISC metadata.xml 784 BLAKE2B 3da20318f2e16ddb08ca7d5920ef57112986fdd0e0c4bfd4acdecb2aedc35123746533b391be47629985d38b2eeef75dae4eb08874526254316bd240ccee5117 SHA512 dad2a904fa5374ae34f4364bc1140d2b550783bdad137269748f614c20803f938ff51cf2cd3154f1bcd6247c3b38a54afda985811881b17515768095987c7950
+MISC metadata.xml 719 BLAKE2B c97e258d05155df5380f08accfa9736ce44514ef9fa9b0fd0a4d5966a48df7ae940902ce929893ffb828f30883c4591c93a2bc5c8ca0c7a6f636e477e8f52eae SHA512 a36e28273a451c529451602b80ec70bca26d2db40a683e6fc7297db185c88696cc359c3f80951ff9580e81e7e221379913f7d1db3af3d00fb02128e1994e7f4d
diff --git a/app-text/paperwork/metadata.xml b/app-text/paperwork/metadata.xml
index e2d2240fe2ca..de2ee75db188 100644
--- a/app-text/paperwork/metadata.xml
+++ b/app-text/paperwork/metadata.xml
@@ -14,6 +14,5 @@ In other words, let the machine do most of the work for you.
 </longdescription>
   <upstream>
     <remote-id type="pypi">paperwork-backend</remote-id>
-    <remote-id type="github">openpaperwork/paperwork</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-text/paperwork/paperwork-1.2.4-r2.ebuild b/app-text/paperwork/paperwork-1.2.4-r2.ebuild
deleted file mode 100644
index 79426a67db7d..000000000000
--- a/app-text/paperwork/paperwork-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinsane:2[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.3.0.ebuild b/app-text/paperwork/paperwork-1.3.0.ebuild
deleted file mode 100644
index 95b004a9b3ec..000000000000
--- a/app-text/paperwork/paperwork-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
-	dev-python/libpillowfight[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplebayes[${PYTHON_USEDEP}]
-	media-libs/libinsane
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="${RDEPEND}"
diff --git a/app-text/par/Manifest b/app-text/par/Manifest
index 02c9ae188b61..41fd38ba3267 100644
--- a/app-text/par/Manifest
+++ b/app-text/par/Manifest
@@ -1,3 +1,5 @@
+DIST Par-1.53.0.tar.gz 52209 BLAKE2B 4069f75e1d0ff397938941ab58020c41cb1b896ab91b370c4f9c9a4d4eea1fe695cc0c27b0129780d40b7274e355ac1f41a933d051bffebc938c284e71971fe6 SHA512 3f8ac57fe19ebcf427b11f4d79f2c5cc9286c1439c38a53d45bd29b9219369db2798efbd0e203ac359d59ebbdd3ead1c50ae75352a1ffc568d4d3b9ad50642b1
 DIST Par152.tar.gz 47999 BLAKE2B 0f76abde64d00d0511d9b0b0ce2a97b13917e08fe3bd1c69fa98ca19dff75a2b55a21f5eaa8bfd0660b6523336de6c29b2a58647196ff6af8c24ec156a426bb0 SHA512 f5a46da4b693e6a3d15ccd57e24ee9b0332ebfbcfc88da9ef0731e18932ba6f0adde7691a233264d6361e8903ff7e2263f71885a415c896dc4c45a0d05b1978e
 EBUILD par-1.52-r1.ebuild 722 BLAKE2B f9aca7e9d0a3d81f5971cfbaf0eb30477d87dca750d7ec2a5993178662f256ba5c7da487395690f3b1f437a503f3fdea7eef61b0e033a8d562e5ef14bd28cfaf SHA512 0625322d759184ca511567f15594cd44691699df0d0df985ddac874af5609e95c40bd42a522152d9223ded7432894cf94c7c4e3c75fc98ef464d92f026d01028
+EBUILD par-1.53.0.ebuild 757 BLAKE2B 5942b5bf3730973502c7138eff2cde4e0ea0b7c70288ca631f9bdd8e96fc449873f48cf97fbad111fcb8e2402873f79bbbf55993133ed3b2d82ea06638dc6795 SHA512 8cbd7d8edbf1ec06fd776948d21bfb7300f585b019cd3277b259eccc94feebcefd6f56c3cbec3f094e767428a57a324d679915a5854ea9da8be6a21c8f7dd9f5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/par/par-1.53.0.ebuild b/app-text/par/par-1.53.0.ebuild
new file mode 100644
index 000000000000..3165b8c44367
--- /dev/null
+++ b/app-text/par/par-1.53.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="Par-${PV}"
+DESCRIPTION="a paragraph reformatter, vaguely similar to fmt, but better"
+HOMEPAGE="http://www.nicemice.net/par/"
+SRC_URI="http://www.nicemice.net/par/${MY_P}.tar.gz"
+
+LICENSE="|| ( MIT par )"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="!dev-util/par
+	!app-arch/par"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	emake -f protoMakefile CC="$(tc-getCC) ${CFLAGS} -c" \
+		LINK1="$(tc-getCC) ${LDFLAGS}"
+}
+
+src_install() {
+	newbin par par-format
+	doman par.1
+	dodoc releasenotes par.doc
+}
+
+src_test() {
+	emake -f protoMakefile test
+}
diff --git a/app-text/passivetex/Manifest b/app-text/passivetex/Manifest
index 464b72b8ce4a..d7a550a6a20b 100644
--- a/app-text/passivetex/Manifest
+++ b/app-text/passivetex/Manifest
@@ -1,3 +1,3 @@
 DIST passivetex-1.25.zip 1190258 BLAKE2B bc82a0414c5df9b5619b099899ac3970943672fc3b76fa60549ba36dd60861b591c62174f1f55b58b0f51458bc961ce47fee9b991795e2d321daf3ae4b328e9d SHA512 083ba4fab9fee327ed3fef5bdc48b415138951432dcb53b1478d1ba16a92bebc1cfc4b8590e2aa647a32c7658124f2aca8160230176c623bbf531e996c43622b
-EBUILD passivetex-1.25-r1.ebuild 769 BLAKE2B 798f8ef8c2fbe2b5c9a2c9c9f8de03c2fe034e439735ede95f02c42a36a4134e4dd3dc0232eb6242b355063f388c185a66aa6263e2d8188ac2164c8ae11d0313 SHA512 ace24b708f703277cd71a28893129cc3a0235cd6ed46b0b94c6e38a116fa275a230b8afe81a23e260834731a0f0d8d8d4fdce95c0f7a0f2a98f2bc49817730c0
+EBUILD passivetex-1.25-r1.ebuild 767 BLAKE2B eac87fa74905e696981d533f34b3b04d18d051315595bc0df3df37cca14cf5bf7ab7053eb836f989d86c8d0bdf84fb09a63b04f9232e0b6ae50d47654c7627de SHA512 2747418ffbdf16c9dd62d3aa7b5ce9a33eb317e0101b1e5fbe9ddd0a4373e7b8f21b2797562cc747662d9d580a43aba6491d59e27bebdebdba08cdcd3e483b11
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/passivetex/passivetex-1.25-r1.ebuild b/app-text/passivetex/passivetex-1.25-r1.ebuild
index 59491a44d243..209a1b5cd180 100644
--- a/app-text/passivetex/passivetex-1.25-r1.ebuild
+++ b/app-text/passivetex/passivetex-1.25-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/latex-base
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index c799194f5a2b..ba6f2393d1a1 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -1,3 +1,3 @@
 DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
-EBUILD pdfjam-2.08-r1.ebuild 584 BLAKE2B 2dac237488291277f36b233938b8dcd4de2d6089d23b2501e2217b5b7e697349b6561881f1a4782cbe7306db66c69da4bec09a58275a066929533f8397fca28e SHA512 396d7fc33048409f5b577c6f90e625d28bd0968688e236a9eed6e9cc11b4b000aa06d91ff0006117093444d2f294cd9007509998f3fc8defe6840ac0cc979eeb
+EBUILD pdfjam-2.08-r1.ebuild 582 BLAKE2B 7b62f8256aa8c7703acb2738cba6b8355634e4228e6ef94b1ab75588ce600931796a8f2cc5a651e431bfd820c663450ef3b505093e397a1a008075e3e85d9c8c SHA512 17fd69151ede6550eec958af5ddff73addd883863070900dbf55cf22ad237e928f4d261c0cb3c038f19e0f92aa2cc4ccde3da79690036bd1c6ab1be5034adc90
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
index fe68622c60ae..c98be3eb9519 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}"/${PN}
 
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 9acb69ef1f90..897887279abd 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,6 +1,6 @@
 DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
 DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4
-EBUILD pdfminer-20140328-r1.ebuild 711 BLAKE2B 4293a17a8ff55054f70ba706b6891900c01fc2dd372fef392112272f2d0a7a355d4fb1ae34c3429faff6dfbff9427d7036e57895a44e1a15b0bb33c40df41cef SHA512 801fd0b59a9d197e407ebc764239a739886c6a8b5f51efb8d9c8bd96a88008a2beab6f90b834859164c6a89cc8d5a284d21ba882a688b96dd24ef343c843ea40
-EBUILD pdfminer-20140328.ebuild 646 BLAKE2B 4d134bd1415669c0e0b4b43540ac11537074da4a729af7a4b39e21700cdc114749971e8e843ee0b43a854331d1795ae020b821c3842a7abea83248f6cbed7cc4 SHA512 b4b943e9680beb80e7935fd5b6b683221f163972ca97f84d9344950473f476b4fa307590b3198b73536888a87be25914f8452030f591ef2bf9094cb599ee47b1
+EBUILD pdfminer-20140328-r1.ebuild 779 BLAKE2B 7c3f07f51fa5b62654bf4e8b877e1cd752ff6546dd466fd8106fa8e40ebde1f42d7a909dd8a533c5c1fefd3d69ac646cf54e2cb74bd97805e38a6d87956166f4 SHA512 6ea9601e759713156ff3f93025fc362e1abca4f83b96784aed7972122e7d0065fab1a0671d90cb235cd6bc4a4a0e96076b489b6c2e803d054e13fbdb74eeab2e
+EBUILD pdfminer-20140328.ebuild 714 BLAKE2B 521142f1e2d74ad8487d7381e4db1fa73fda77a7e91187df4b6580f558e91dfdef6df8f8bb303ac17e438e2a3d18f7a8d660a94d8b0d2458ed6dea8b1534b2a8 SHA512 301947f92084ac278decbf638235bd539b5b63cb001ff1665965a502d94dd52380c1bde7cb222a7f4bce4639d87d182a3d767391d6f67d6485d53a7c4917440b
 EBUILD pdfminer-20191020.ebuild 793 BLAKE2B 3ebbc5cb905bb2ca09d9c2b78ee67e99bd0c8ad41ee8d8faac18bb3f12a5990761a04ac3e02f451581506df9ee44a91b69d2d020d7de817ac18030874b67e07f SHA512 b1f1a8364afcecc11a76e058f0a193cd8be4d251fe51da36604c945614186a2531a4d876fd706c76fe2060fb6b1b35e356df752fce4920815d7303dd9eedc390
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
index 342b4f9f88f3..ea6d4f1215ed 100644
--- a/app-text/pdfminer/pdfminer-20140328-r1.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
@@ -26,6 +26,11 @@ python_test() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/. )
-	use examples && local EXAMPLES=( samples/. )
+	if use examples; then
+		docinto examples
+		dodoc -r samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/app-text/pdfminer/pdfminer-20140328.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
index 97c356bcfc39..8406215f4789 100644
--- a/app-text/pdfminer/pdfminer-20140328.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328.ebuild
@@ -21,6 +21,11 @@ python_compile_all() {
 
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/. )
-	use examples && local EXAMPLES=( samples/. )
+	if use examples; then
+		docinto examples
+		dodoc -r samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 650a2373fd8a..3be0bb8e8f0c 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -13,7 +13,7 @@ AUX pinfo-0.6.9-as-needed.patch 457 BLAKE2B 5e104b202a66c377cad570d3427043fe8273
 AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
 DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d78518bb4d5399c100bf0aec291c869576b18313e00f8572610cb967c3acb5f8d643c48f1295fd2efa8e16e3e6 SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
-EBUILD pinfo-0.6.10-r5.ebuild 1315 BLAKE2B 3adc8e66d843cdc84892ebe058cb8883ff7fb84f5042f987ab3d55d43a991b0fd9bb638004d542e139a06e500fa9f7fd8ba30b5665555c8ccf1ba267830be745 SHA512 7d479b636c656d7f0b35e870b36de79e49aa315a52bf23639c0a25dab81c0f2425a9d0f86b3bb9fc9974c7d424237f6c085d010548fee11af1a4acd186a6ede1
+EBUILD pinfo-0.6.10-r5.ebuild 1316 BLAKE2B 4e2e29c94d57c1a2a5f0811762f863c71c34bdc9e64f223441a568ceaf7a02364b9c525d8b4b3ceb1eaaa21fe87df2b3fa1f397ee730104a05d19775f78541c9 SHA512 6fdafceee5ea2ce77adaf678b1c4e03389a7138edbe94ce83e51c6e1b2492de8c8cc50ec07a62a6833cd10a4c21fbfb51018d1dfb6268a5a5ebb927e3f24151c
 EBUILD pinfo-0.6.10-r7.ebuild 1430 BLAKE2B a369621e3778359219a0850f19fc950fc9699fcf6e53c3d63846b6b817442294fdb08b76f4441234a6a60d2e52c61972896a8f6f2781346ff1bf18b639e4fa96 SHA512 fb80e9c0bfed07d6dc37607cd05d2868102a554855f73dc3b4a7f780f50c3e525fbc096d3464ea35f524bb221b779982343afd3151e1e616e94c01356f800e01
 EBUILD pinfo-0.6.13.ebuild 1033 BLAKE2B 86e5709bbdf2163a2def54ccd00899d7b742b85a77ad4be4e069241cf4ca8c6152780d6db48f7cbdf27b83a1f38518af421bf2fcc2bc8603c046a569699b9615 SHA512 bf207f46871847d6e3f0e39e37c24d2b983a8b14cea5e3335beaede34e9041d58d48aded6d83a7cfb3866bed8fb5df18d6c99d0748a16ef0e512954b078c854b
 EBUILD pinfo-99999.ebuild 961 BLAKE2B fd9160283980bf7bdede66ab5133f511d820fba9570e305676fc0170845cbd31c9507367f10705de3e4e2e218b4b03732ceb7697b91ac7ac570103d5d6694128 SHA512 b6d9164f6b194b0cb2be0615890496cc522219d8b29e621f52bde86b37044466c1099e0df65d5a408c3c83cb62fff4e8ebe2276891626725210d31b6fb643230
diff --git a/app-text/pinfo/pinfo-0.6.10-r5.ebuild b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
index a7eb510edc24..54b487de0d97 100644
--- a/app-text/pinfo/pinfo-0.6.10-r5.ebuild
+++ b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="nls readline"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 8c6c4c71a8fc..ae019eae74a3 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.56.tar.gz 2994792 BLAKE2B c95905c70d7e1e24367fb128d9096996d026f58dd4cd7fa77f19c6c9b8607cb4101a1a024773d2fd383e905a008e1ce4f0c019a73003168a90cb23328ac1d984 SHA512 4fc1ca5743471577d9e8bd0b80285b9dbd83b964f8e828472787a6deaf8b8388bb7f96e68afab4119c1f5488fe371d3b1fa94b101204a59228d1cc2f0878f3c1
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1657 BLAKE2B 8759367e068abe21c381155b1125f07d752429bf0de18a48124e9e4373b3e241db4df34ce89dd123582a9f064b5620db46a59384bf93f2cf8fe232b1cfd74b3e SHA512 1add5e091166cb27296b9ca9535758fa46c06af0e1bae7387f0778ed72df39232127bf64a80548e9133f00f751e66ec9da9cacf902582cede8a13511663f8643
-EBUILD po4a-0.56.ebuild 1324 BLAKE2B b4af81c57aab554457df323e68b1042f3a9d02d2d4353743b71addaa8ba1d14e8a6ac57822927f2a345e07f8daac775acfbdbac812bede7e4c5da98e2f2dccf4 SHA512 66ff950db06217a91de27665594fd2cdc7b8a7f0e295a6fd0f436065ce48029ca79ec91980ed7b186c347cdfb21c9703fd31af0a26b0aa5fed54042f9a6fccf7
-EBUILD po4a-0.57.ebuild 1327 BLAKE2B ce5f7c5865ed797cabf0702eb9f0e45816e39dff500f9b9da7ad2ded060481f10e86c3734b08304d656595b5b69754930bdb5fdfd39342475f55c9ae811be897 SHA512 a002b5fabfac6fc815119326beb40325c8535ce413a6667b2dd7a5714c3dc7f1abbc8d5e9fcca7d09a1315300fa3eda6ca817603348c15761f396865354c35ea
+EBUILD po4a-0.47-r1.ebuild 1655 BLAKE2B 7c2f36e752175375c9d5b7d276511d374d82d6b3e09e8b74ca55024e4c653677c2ebddf530e0af7089e06e047405c42495a0544dce50cf3a0d0ca219fec599c0 SHA512 5fb60aaaadb2f4fe09bfcc0a2191dd9dcdea5ad995581d7e547a2ffce62599cb9ad8f878964fe4bd8b4d77f1de3b0f5acdbcb2b87c657e101693db825a8a7c2d
+EBUILD po4a-0.56.ebuild 1320 BLAKE2B b184be6310d41915992653b61c0ea3d98a6723e4429810bb2b81872c5c5aaa8c407f9364ffeb895b6f293248e85f9bafadc9a50186eae10424b48ce59d4273b5 SHA512 4e3735928df5e2401a09a8c5be51f8642baa5f0174d778ecef243fd3c878792a74276b2683f3dfa56ac25547d2136371da8a95b0728938a6a4dea9ae53098fda
+EBUILD po4a-0.57.ebuild 1323 BLAKE2B 8e81b5a9f7d5bfc3095026193b534877e514c9ee3246054bd93defa25b9ef0311140ec557d2b6ca7df5e43e37104ad034538eace247dee0d1a762e2ab5b85efe SHA512 13a9179d861d5af57bdaddd70375a5a516cfeee4865a2b725633d3baa435879a461a0e74cc0b4b758ec258fd27912390a3d6a03d8dba905b520923689df6f6e1
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index 3d48ba482146..4eefce674b69 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.56.ebuild b/app-text/po4a/po4a-0.56.ebuild
index 3cf5d3d570b0..a3747855af42 100644
--- a/app-text/po4a/po4a-0.56.ebuild
+++ b/app-text/po4a/po4a-0.56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index 8c24e87cabce..1292f24f256d 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index a5593a6620e2..e327c1520bbf 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,3 +1,3 @@
 DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
-EBUILD poppler-data-0.4.9.ebuild 763 BLAKE2B 49af5d7502d511436a6ccbe104740b6919c184409982c679075dd83b8eb30ee40cd35898ffd71d69cd126eb80e51bab09fc00ae0f59af09ad6c372f176e198fd SHA512 a00fd2568544bc2dd5bd6916e9706145df3526e4d1ecedc9c20170ea628545efda2ac99cff99f90e36047ae6c82ac017eb35eb6fbbf074076cf7ccc5f1f79a47
+EBUILD poppler-data-0.4.9.ebuild 760 BLAKE2B 38b06c1797185f673aa67e77fd75c9c50abc2470db7134707c29f5adcabbf9f0c48875e3348ff1bc14ca257f508535bb5250aa3f75e6f189647a4f713de434cc SHA512 9eac446d1d0c52b90f6f4ac4c9978a71beffa0f522ffac8b143fb563b15a3c213400cd8a61a078079f7a9cf7182dddeac8d718afd6afbe27644c407b93ace307
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
index 844ef3a5b61c..d45de72c82bf 100644
--- a/app-text/poppler-data/poppler-data-0.4.9.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 651c2a4e223e..2233fda39d01 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,9 +5,11 @@ AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27
 AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
 DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
 DIST poppler-0.85.0.tar.xz 1588616 BLAKE2B d30c16ff214d2b64fade28bb4099567150e99df6ab967702f48e18ed2191e444728f51d4c1ce1772567c31f9b87a8cf64993ebc383184e06f8b3707436c89143 SHA512 2311bde5ae52e065c12a6129f500469860f5ebefafc3f7be581393f08c2121f3eae57394ff54c1f83ee1b926f28c61530bcd8149d42de10a16b9ba7345f2604e
-DIST poppler-0.86.0.tar.xz 1593992 BLAKE2B 7b09d3d173db31a3dc2965e7eb5dc80fe1e714a7f1319b5fce0719ea345f496313536da023da8f7793d7365210159b26ea23ae95bdef709efbe665abeb13fdb9 SHA512 58a8ee7bc0bae1dfbbd1bd8d2f66bbb77bd4b93637f500b7d69f4b57d20f7f14b2b23b74f2e34a3f00c7b7887c366379ed6d95f5e1e610eafb9cf7847ea7583a
-EBUILD poppler-0.82.0.ebuild 3327 BLAKE2B d86c37fc03b547298324a6f950c9ebf99450ac7e5b14648c3f8c234d187781e8d5e42d6a405d56dad9016445a85d2556470944767d89e6c83a0525d302f173c8 SHA512 722eb340a4bb71ae810629afb4ac2d73a19a07d2a2a3dde90a84244c4eeb35a2c711dedad6b6c0a24da2c63bd12e90a0aef2790611e723b7a0917a018871a748
-EBUILD poppler-0.85.0.ebuild 3366 BLAKE2B 9584abfe5136196387ca4b565aa0da160ee089b93750ee43f032efc0d588cd97fc1e64e1fabe736c4076a6ed0563abdaa0ef0f5fb0c44281195b5480df21385f SHA512 e08ea49d45b58d256f3a0ecfff5891b70bc46b27e8d0230f437eaafe55a168095304a35101d8ddc47a3b9a43c83ed2ef0f6f54b343ee3513bca2155965823b04
-EBUILD poppler-0.86.0.ebuild 3366 BLAKE2B 24034c6c2839a55ccd179a78d38f38de6ea727f71461d226a52699d451c6b46136fdd09f4efc0b7f1a1d1d91e1ebbd06c401cef7acd086e57129ba1b07695e00 SHA512 58b9930d61652d7db5ee3915c7b57a5470b2871a37ce5ea7067f11bfc1b744e6781d6fd5365adc6f870b034e6631d0c0fbfc5c6a3f4f4514779eec3fd5023f0a
-EBUILD poppler-9999.ebuild 3366 BLAKE2B 24034c6c2839a55ccd179a78d38f38de6ea727f71461d226a52699d451c6b46136fdd09f4efc0b7f1a1d1d91e1ebbd06c401cef7acd086e57129ba1b07695e00 SHA512 58b9930d61652d7db5ee3915c7b57a5470b2871a37ce5ea7067f11bfc1b744e6781d6fd5365adc6f870b034e6631d0c0fbfc5c6a3f4f4514779eec3fd5023f0a
+DIST poppler-0.86.1.tar.xz 1593856 BLAKE2B f39a3113d8d33480b186173dade5305ad8157b38df579e18f6a05ae48e449259aeb9788e1c94ab3b43fae9bb027655e4e3072ddf8a6dc9ccdef93262def62160 SHA512 435fc1e7f3e8123e0adde9aa60c0d7dc17db367cde8908932abfef913cee6f27efeb1c4f2d6f316019a69a87f1fa5251be4216d0a81a681a24f24a70ac571670
+DIST poppler-0.87.0.tar.xz 1595088 BLAKE2B 7bce4426b057ae8702399f0f3581ee844df89b01151dff9212e1d2c525847eba7614697ef02cc7278930b5e266e15f62d3b7c5d989951d44c62ee3f8fb9b2835 SHA512 4bdc432c75106b3f37643bfd57c66aba659864fdc3c4d9ffa5089ceaa33ad3bd10d2c4abfb09a4f7b9d7d137e31eb559b440d7df53f35f60d70eaef05f987630
+EBUILD poppler-0.82.0.ebuild 3325 BLAKE2B 0a5f0eb240604e93806d31f6db61a04c3dee04334daf030e81d5f30a0e5e200db72616d15c741b19baacf5203ae22e917f1585368c05b6d86d12f0e650bc388b SHA512 4f3b045f5893f2454e20ec193bdeba91b13ad184a90895e1dc453baeebbd6e4c6d2d7c74cb071827a93f26de8dfde47b368e84227971a8b455f73c4780977494
+EBUILD poppler-0.85.0.ebuild 3354 BLAKE2B 4302a00fdf67d9e6c31a245d3e896cc0bac0663249682efb44c3d307f5a00bb2f7b0195195d70531a784b9bc13dd3b0853c7a4e7189d7f04b2d5f7b572740bdb SHA512 b6f25ae17135528bd64dff6fb068d39026913b332410ec1b512834b339286205a5664564e8f8348e98678c81a4e00042b3e10cef4a70ec3525d91bd4bab2743a
+EBUILD poppler-0.86.1.ebuild 3363 BLAKE2B 8a0df9f49b147b26f9bbbc35fd64536fd57cc245850a5e7fcefdaaab9fb37cc9216862e2792f16b97e531ba38e8d15b67406805ed3306aa46e49283d9f1d8eb5 SHA512 5b01395cc4301b305731ab764067d62bf8770b07a9e54e50d0b2fffa90b5c1f39e0468f2043d5cc76cc507b9dd0e6728eee3cbce77beff2ef76c7a8b9f5fa52d
+EBUILD poppler-0.87.0.ebuild 3363 BLAKE2B e9600b268bffbd857c8e0ac79087c61703ec0667126793ae069bb763f2aa3974f3b4b9b0b62b1fc4d323ec7bb7009fd788a948568c83b52f5c1f36ceb54bda63 SHA512 b30393fd43ed0ba92332874794a6ba64d89b88a7f82894571665389aa7a4aa347da663e70818ec6f0a2c56a6195b5e8b5aa179001e9ff9e4e043cb5a7332e227
+EBUILD poppler-9999.ebuild 3363 BLAKE2B e9600b268bffbd857c8e0ac79087c61703ec0667126793ae069bb763f2aa3974f3b4b9b0b62b1fc4d323ec7bb7009fd788a948568c83b52f5c1f36ceb54bda63 SHA512 b30393fd43ed0ba92332874794a6ba64d89b88a7f82894571665389aa7a4aa347da663e70818ec6f0a2c56a6195b5e8b5aa179001e9ff9e4e043cb5a7332e227
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild
index 21709f94c20e..4f5b129533f0 100644
--- a/app-text/poppler/poppler-0.82.0.ebuild
+++ b/app-text/poppler/poppler-0.82.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/92"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="https://poppler.freedesktop.org/"
 
 LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
diff --git a/app-text/poppler/poppler-0.85.0.ebuild b/app-text/poppler/poppler-0.85.0.ebuild
index cdb9a9313740..28074680e781 100644
--- a/app-text/poppler/poppler-0.85.0.ebuild
+++ b/app-text/poppler/poppler-0.85.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/95"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -19,7 +19,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="https://poppler.freedesktop.org/"
 
 LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
diff --git a/app-text/poppler/poppler-0.86.0.ebuild b/app-text/poppler/poppler-0.86.1.ebuild
index f81798f9ce05..c0cbd8d01cc9 100644
--- a/app-text/poppler/poppler-0.86.0.ebuild
+++ b/app-text/poppler/poppler-0.86.1.ebuild
@@ -11,15 +11,15 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/96"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/97"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="https://poppler.freedesktop.org/"
 
 LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
diff --git a/app-text/poppler/poppler-0.87.0.ebuild b/app-text/poppler/poppler-0.87.0.ebuild
new file mode 100644
index 000000000000..da61f3d0f0f8
--- /dev/null
+++ b/app-text/poppler/poppler-0.87.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2005-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/98"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index f81798f9ce05..da61f3d0f0f8 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -11,15 +11,15 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/96"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/98"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="https://poppler.freedesktop.org/"
 
 LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index 67f7b9eacb62..41acbf41e453 100644
--- a/app-text/ps2eps/Manifest
+++ b/app-text/ps2eps/Manifest
@@ -1,3 +1,3 @@
 DIST ps2eps-1.68.tar.gz 97304 BLAKE2B 594b894b2d81f64c8c6a7461d1df96d7b6e3ce3ef8f7eaf58161eb6a05ebca7b2d304a531be954898f1a9ad53cccd84536b64127b080afbc3902265d2e4e1108 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b
-EBUILD ps2eps-1.68.ebuild 914 BLAKE2B 09e8cce0a9b4958159ea8b88f1621a1d36bf7f48a240b4ae6d0cdd5e70cc27e2963b7c362d1f2b3bec38a503314f5f75d15f95503478ef96d302462d5f6ccf8c SHA512 e9967de6f02441dfc2309687c77374c287d803bd81c8e89415c05f25aa03ca134e6be48593ed2fc6acf9581ad5e960e0ae3839fa7393efbf11d309fb29250b36
+EBUILD ps2eps-1.68.ebuild 912 BLAKE2B 09ca8b81ae0d8f675394b23d6cdaafcb987cbee8f107642c89527e34093df18612724a4cd0c0e467b4cfe3d31c7640fe802523e28b0f82f2ce0f3005ae417499 SHA512 23d92ef49746c7e0216222833c0660220c7fd78fd7d1843c2bf69b3b3a6f50290ce36b8fe5e35c9b1089b63465fb09710fcc1644fa12d80075553d4a34cebb76
 MISC metadata.xml 525 BLAKE2B d27db1f0104b7ac6fb9e61c95da58ce62a7dddb28eb7c160507efc87b9b6930df11f889e8a8f5ec1e606209d942254294933313581a2e5dcb0f56c578e4d4080 SHA512 0d250fa2b43ab06f9d214116054bd21dc43f130c5518b430c2bdaaf4a4038fee52d61c6a82b1fe0736b966634e24d7fd99c6a88e171a05e7b5d9cb83a45ca24a
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index 1641d4605df4..8e09d4cae158 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 90839491f5dc..8a007416be32 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ps2pkm-1.8_p20190410.ebuild 765 BLAKE2B 56e23e66491d2fbcaeb296fb9e5f4c0086f223eb65ecf50edbd3acad41fefaac695e5191f0939f988ce1393147628940933e6ec61f9be4834758382b5e6a3a8b SHA512 c6eedc5f1f4fb0e1568a71185a2aef6b341a70300e3f72123e70068e672eb135101cf1409e14db5118ea3af28423f71e67ec7efa213241b36015c1fbd00d0ad7
+EBUILD ps2pkm-1.8_p20190410.ebuild 762 BLAKE2B cff23395359b9e62171868f06b7104fa56ed0497d46b1c09852193fd7244be02d5af4fd2d2c42a4bee35288d23c2e61d0cea4d81846f6fa7305a126f04820326 SHA512 6491c4889e25d339f6c9a22c8152f9dfa28b6c88fa6b06fa8ac9052cc627680befc4f68162c468d77b0267ab0ab1afc9a334e57dafa859efb0567f37df87de7c
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
index b3c76732a619..15e9d39f593c 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index ac845c6d4f31..da91e6a172ae 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,5 +1,5 @@
 AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r3.ebuild 974 BLAKE2B 509f10864f4ac1ee612033397a5845dc026c4f67705a408d5b4a96d256d509fb026047ad92e27c47895c561082d0c7c4bb8fa3d502c7b5e07930c850bbeb4247 SHA512 f4b02a32a55dc4c050388e048b446979d74c4a7bbc88b1f30dc97cac6bb933409c973f61b2823bb7751aae2796a82fed31f5a6b83f683c2fd3a0cf2552da8263
+EBUILD psutils-1.17-r3.ebuild 971 BLAKE2B 210fb8a3c31d61468b1d790068776cd14cf878487fbc7365767b6fa0c715e9995e8ec3c32e278b6b49559433c79fba09c906eabee5bcd9547ae155ff42a5ecf4 SHA512 a254c927556fe1385c5ee5dda5c2a37ca812ba7f580b10ada81b6a5ac6013f351168286472da5525f1971aeb32ca89af6eee95590ece463799c4580d62879b17
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index 8aca2e46858c..901dece26585 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
 
 LICENSE="psutils"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/pybookreader/Manifest b/app-text/pybookreader/Manifest
deleted file mode 100644
index 18147158a7e9..000000000000
--- a/app-text/pybookreader/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyBookReader-0.5.0.tar.gz 285488 BLAKE2B 70f2a5c52e2310fa87c9a1e07d0ef4877ec6448ee288162994b037c4373c269206505d2b2f49b61727650ea251283dcac62bb53ca659cf2fd1c0b9374b534124 SHA512 0eb3b71b58c62706ac6cca70150d28071a0a24e02ae2949a8a26c02f5d060effec941d97ad3c5e4fc5a47fb222c315a91258ef31360e2f164f85b6728e6e239d
-EBUILD pybookreader-0.5.0-r1.ebuild 554 BLAKE2B 0fc67237388ae6ec5c6d356021e655ee37ffaa7b6f7b595ed09fa03f9fa8b66f984f91caa99446ca70a65a8dde555899f284950062cc6c512cb21b0aa6206169 SHA512 0f4e01a5c5aa89f29b171fc13a45047f541204cebcb8bf06066eba16a6cc875e95c3dcb2af2a7c7680f83b3a87ffe3b315a544785c6bc526191125e18618a017
-MISC metadata.xml 427 BLAKE2B e3495bd873b17e863a2b55c6a45b9e316c1e39c90a5923f9718c05105f2e0997ac0935d4ff5a54d53e7c65ea9ad77752fda7e808a119023d222c009391bb9efb SHA512 39174d33ba3c17a9599c8c57d70690c4dece94eb56eb2ff70462a00990af31714c43210286a8058019fe5e8c854d7cf690eb71c2970f9b8b3e60eaaed5e31fdb
diff --git a/app-text/pybookreader/metadata.xml b/app-text/pybookreader/metadata.xml
deleted file mode 100644
index 87f48c530938..000000000000
--- a/app-text/pybookreader/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>grozin@gentoo.org</email>
-		<name>Andrey Grozin</name>
-	</maintainer>
-	<longdescription>A book reader for .fb2 .html and plain text (possibly gzipped)</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">pybookreader</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild b/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild
deleted file mode 100644
index 0164ae4eb511..000000000000
--- a/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="PyBookReader-${PV}"
-
-DESCRIPTION="A book reader for .fb2 .html and plain text (possibly gzipped)"
-HOMEPAGE="http://pybookreader.narod.ru/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 2f409a45cffe..0f4f0a5d2fac 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,5 +1,3 @@
-DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
 DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
-EBUILD pytextile-2.3.3.ebuild 1030 BLAKE2B 3b8c0ca00a486265aee921a873b66d5b1cf181f63c29384dbebd1eaabdc4b414643fdc7ed1eb8820417a458857af8fc5c358a64a79d66c275b08e5e7f64aafdb SHA512 b3db291714c0cc8444248939dbf63c5c807e8df7a0250b54fddd27581b1aa4945e2d60a29d567a476bbdb8e96a3d4f5090d51b1e67060f71115a7469ea51893f
-EBUILD pytextile-3.0.3.ebuild 1030 BLAKE2B 62fa21225063fa22108c47d66c06cc529a52e0352bb5429b4a83d4af1371394eb4c26c0eda53f11a7f47fa1614937ded4b4ad291e75e3522a8c7ce76e28b4d8a SHA512 9b4217b5166fef296bf77e40010ee0283a0ef3f0035b724e144dcd8bc5eb28d2fdb7afcd3432ee021957dbd7b32f51bbcf23ffe5b900ab3684ad3dbcc8333ba2
+EBUILD pytextile-3.0.3.ebuild 1025 BLAKE2B 7f99559324e89b88bd6f901d9083d1b6d8eec90e5f87d13779de82f1664866e98e9d729944f46f73e80c594f43e8ea99a6935761cbdb76f18acb0feea46bfac5 SHA512 df1939e9580235a9131f3b3ff519305e7c49e339f2497f77df7ccc9969f3be27f8b5391a9780089ddb7b82842afde289f392887a0cb862f84b4d95974ae07116
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
deleted file mode 100644
index 69515f328b86..000000000000
--- a/app-text/pytextile/pytextile-2.3.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_PN="python-textile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="https://github.com/textile/python-textile"
-SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/regex[${PYTHON_USEDEP}]
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# This resolves a nasty race condition, courtesy of Arfrever
-	sed -e 's:with-id = 1::' -i setup.cfg || die
-	# remove useless --cov arg injection
-	rm pytest.ini || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/app-text/pytextile/pytextile-3.0.3.ebuild b/app-text/pytextile/pytextile-3.0.3.ebuild
index 136381cfdbd1..d53e23a4e6fa 100644
--- a/app-text/pytextile/pytextile-3.0.3.ebuild
+++ b/app-text/pytextile/pytextile-3.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index f11dcbe07385..86a79a6ab0d5 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,7 +1,7 @@
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 DIST qpdf-9.1.0.tar.gz 18285597 BLAKE2B ef86cd4192805761e121bcd112e071dacb4bc108335da0ba237476d9f1698e4ba630010e3266fb63d9aa5b97e0e778f76fe226613e91d351b93a53b9fc9abee7 SHA512 7561ffc366dbce9df58cc85ff18480b28b0d46de04733ba463139188bee95690f92cf0960a328619f0c9f34ce865598db490fa1c6aaa76ee87d2c034a5f7f57e
 DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
-EBUILD qpdf-9.0.2.ebuild 1274 BLAKE2B 023c2e37bc11ef5b371bfe994ec6f089382b3100718bd30996920399f632c117da8c2f902ff67d36ba8ba833e2d75dc3163ef23ff94e233696f1c1dc9acea899 SHA512 412b441ba9358995010a17ba5efb8a6a2a1de75ff5a79aff91d3dfe430b90c6d2004ad27ae872f9c4575e35c16a1f4ef15b32b8395a1cb23c8da2c74923773b7
+EBUILD qpdf-9.0.2.ebuild 1275 BLAKE2B 734241fc7d46a3340ea6b5561b5a5bdeaeedcbc27df2cdbe1a56314ac3da57b8cd450ff0dc5413bc9eb05349d52382838b77fcdc37c675da84eae0318bdc4359 SHA512 d17952de2eed88b93d3236e80328c4816a30add65ff0bf3f6588530ec25d0d1e2e84724ff400216cce537a1e1013a243c5c54deea7d1ec6332aad763d6d161a1
 EBUILD qpdf-9.1.0.ebuild 1421 BLAKE2B fcf852c0c05df1b7699d7dbabe2d01861d41eff1cf3b14bac03fb07fd67a28923cc063dfc8e7111cb1ba20a2485a48c863f86669cf9bfd25849f13b0b66d2663 SHA512 6bd4a49cbfc8972b0bd5781ddc7cd175191156064ae512466556a26eaae36cd7f7a830442744cfe1110810216ac5a98fb20e34f7b8c202c7ebc8880c65357a63
 EBUILD qpdf-9.1.1-r1.ebuild 1209 BLAKE2B a41341bc00ad325e8fc52b7bb72cc93d9fa615a82452c436518cc26310678f3fa1148a72f1ea26c50da5a2b366d69d53327c3138eff72370d06ab6be9ccfa673 SHA512 e94d36930a5c3ed832630ada53181acd18d487ed81e387dcbb0ea1fc9b46d99ec1e336dc9e352888f10e3661c9e0a01469e6d2fef2fc83b5896f8b276305d747
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-9.0.2.ebuild b/app-text/qpdf/qpdf-9.0.2.ebuild
index eb6707e37b91..ca0335153b20 100644
--- a/app-text/qpdf/qpdf-9.0.2.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/26"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index e447eae0135d..49fdf8ecf67d 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,4 +1,4 @@
 DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
 DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
-EBUILD rarian-0.8.1-r3.ebuild 1821 BLAKE2B f39f1e29bdc5525853605cc86fda53ada364325f8004b4562ae5884df8cd1a77af9399868074fea2ba3f9c1524b011735f61774c080d11bd42df39afdb82f711 SHA512 365c4f57ff6b3325a7cea4b9980f8d60c4026a2df6900ca0eea35164e9a17e5d5425cf2895d8a1513f55f019b13853302928b97114be1d838a1747500b884cd2
+EBUILD rarian-0.8.1-r3.ebuild 1818 BLAKE2B aece9cfb977d0b336d703d41c0c20bf19c8bd0f57772e26fe7b23337c1c7c280569201c8ee9556b7fcce44cd8eaec32b78191c3cf1f774e838d8247ec62ea2af SHA512 355f507da5dda16adabc7608fa97d9b4dca321fb31f7ac469fe622cb5ea9a317b2ba5a04fd0231610b79177b7e2c175e59d5e389e399d4a8953360561fcb2f15
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index 5e8874848a74..60188d29a2a4 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index f17a6991febf..49017175faf9 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -3,6 +3,6 @@ AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7_pre20140303.tar.gz 1580388 BLAKE2B 8fb280368e6998c8cb4554f856dd779e70fd53958bf6da5839735e14e741f45b110ac106494703d97ac3390f41736b2d94539dfde4554b3ca70911788ce8c005 SHA512 a1821909e7ba68a315bbd5e0dcaf0a574f09ac6ef1ccf8858aeda1a0affc09cb70353b4bda005a14cff37ef41646a6f5246c5b5a0f6e89db2065eac7ace9b030
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1642 BLAKE2B eb57a1d67b20184011e6b137e8747b60c238c568f9430568b201bf4fe61012ed352eccafa645f64c3856ffab592b574494c4610a2463e119434934da792c2e9d SHA512 d8ad8c94567568b1747946f788563ed8092937d940b9986a01e3642df4089d5877bde7033f67a0b72b1ff921b3d0881b8b2b73f7ba850edfb14e01c3ba412f5b
-EBUILD recode-3.7_pre20140303.ebuild 1095 BLAKE2B e2a89f0b13ced5f68263ce75434a616d8627fb735739fdfcb0adef816598acaca2357a029de71227231089dff8945e441d73e146778ded23a2ae9d7b866d1694 SHA512 4e29c10baae6065d26b3f31671a0bbb6a9c31df9513fa171629e813d5312c0c3d97c99ffdf69c651079e0b89f16ef8c28003730a6849dab412e9f8a1584b6c12
+EBUILD recode-3.6_p20-r1.ebuild 1639 BLAKE2B df12bfe979aa5b6cedaec6ca58148d972e8ab71905088cbccecaf8ebb516c6fffe53ac96d7a266c5e32756ac2207892219c9634ad540d9a6c88554d13d717f78 SHA512 b0afd29e6b220be63f88ffe9cccc00bed68582ea01b7486490a9ae90f8dc094b3427b15cdb7cb6b0505489782231bc002a7e8a77d41af73cbdaa4e3193cda3d2
+EBUILD recode-3.7_pre20140303.ebuild 1091 BLAKE2B 739577d9a5e38412363314897b1609e8b51b1aac977b4a337d6efecfeaa5ac9b87d60ba9b46e25f00de6ff209d5f5eabdb98f1d9f497e3ffb89ab91ded7d2df5 SHA512 f1952309d21129644556b4cf56d9ca9e0f75329cfab2e72205ea3a9055ec0d336100b92f069162753528aeb1ced995753d170cc96d8f2510ba87b58ab16ad9a4
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 20ab82a9d8fe..5c5b4edfe9e0 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
index 1f34cb0889a2..3de99c002b05 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7_pre20140303.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pinard/Recode/archive/${REV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="
diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
index 73a8d7c79bb8..004d5ab7f3b5 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -2,5 +2,5 @@ AUX rman-3.2-format-security.patch 458 BLAKE2B 85807cbc0ffa292c56794f61f37133381
 AUX rman-3.2-gentoo.diff 560 BLAKE2B 7f63625d37971f537c44667a05ec5b65c7c2216c05b5cc447fc802be3a35df365def1c8a95aebd5ed2f462eeced80cd1c106fb2708c231568a7666d1fa7335d4 SHA512 528b2e7385882620ecaa0374a65579e0fe56803aa6991277ea1279d18d65a4331ebbfc2374a711bda2f5722a5fcc236681f9c4dfb3c0abed1e931ff986cbf74e
 AUX rman-3.2-ldflags.patch 451 BLAKE2B ee44bfca1a15b8a52a42c703ca749722257f8ded019fa3119687f0808ad85ae696096bc29d5a7b04c4527382ad1f3f9d8d2d3e3bfb72005a167be3e95693a4b3 SHA512 936c9fb92e3f018ec0006370ea61f010b61469171a22a9f52a6773f32ef3ab01764b726573aa30548b1c9ea6db3893302a45d20c06bc19f7e272b5e531bec433
 DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
-EBUILD rman-3.2-r1.ebuild 802 BLAKE2B 36370bbe737b3f52a74c9dc38b627c1c6f1640fcd7d64f1cf790c266aec09e9fbf1bf584e973e424b7840d0e5b5d959a20423613ec85d05b8583542472ef7128 SHA512 b99f4b9248828ccdde2ed007e6b321c7aceae1b0e275b6e2df6a2f92bd5f5c9012d2516dfb3d1def0d2ae896665528642bee45cb06c6b9d246585ea9194a3ad8
+EBUILD rman-3.2-r1.ebuild 799 BLAKE2B c64d65ddb5a36cd4d5292fd02f9c61e766b0c110be3c833670ec85a01a317846df8da6ec6fc47313227d7bafa85edd75baabc051b0c57e97cb0d8c8662b7c58b SHA512 cbcdf6a685eee2981ebb533812f17df3f65c04c41d7df60a547a88ba77f690980838bbbcbcec43490a1ac5dfc53d8952216756b23945b99521682878b9afaecc
 MISC metadata.xml 334 BLAKE2B f3759592bab3b3f8426acb5a0fff5d5d7efb5618c951e2c0a26dcc119f609702f45327dcc47de6132befee7064536413006e77a09ab67415c041b0697129df6c SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index 0c3568967b99..d57e0cb0ab0d 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RESTRICT="test"
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
new file mode 100644
index 000000000000..dc5219bde196
--- /dev/null
+++ b/app-text/rnc2rng/Manifest
@@ -0,0 +1,5 @@
+DIST rnc2rng-2.6.1.tar.gz 14330 BLAKE2B 04d316f03da1e936603ca69cf5c8e087dd3a45f457d2b245452544e2a74a730d4c20a655a3eea5856f7f91e9154a7196bee89e8cc052cae887c6188da89b0574 SHA512 ab18b713d8756153fe03c76901dac7b090c7eab12042a251f2e97d7ae4e1ebfdf969a826305704f073c9df5a0980a6d8cd5d4e7a12a8caed018cab46a9196159
+DIST rnc2rng-2.6.2.tar.gz 17981 BLAKE2B 202b7f540197a5a17367a28524c4ca2b532d9e051b349654978754a0b96ecc89536a2a0857a1244027e0815ac1351581054c818787faff8e9a0ebd034c1c08ee SHA512 d305e902e16b3c30f6654475b28b2c71dec40bd6f7046bba8e56b81b947086e004b6b572ab3851c8622d00ddbfd7c65228d2b39b1f1cd647ebfd1e3082886f28
+EBUILD rnc2rng-2.6.1.ebuild 530 BLAKE2B 0d7182953a75186e6819182d7b52c4970f0ebc29b8e5ac1b42a7fc06f338e72e55f7a5c262b6ff532b2507c71bd6ab6fe712afddebe8f91cffb6eea29130a0d3 SHA512 dcc21fc62363aa6aa99adbf82b39e61bc3dbf58fd9d636ecf89143a6e1a4c61f5bca1af8bc363c74bcb2a58a0f33ffbe0b3e618e148737a4af3dca822f081546
+EBUILD rnc2rng-2.6.2.ebuild 520 BLAKE2B 9b089cfc741a24ed785ce109c9693fa0673f083e46645baa2389ecb957877586242479048f9d4f34602520277acab52b632e684fe5ff97f59ab26977a3dc4cc5 SHA512 e789868bb19ba5d2e154fba81fe68dc910357a57e7280dbe59cbad9841e3cae7bf2c6da59a5ff36a4983c5a764d7f055f777cfe6fe30587d30798a71da3e5a01
+MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
diff --git a/app-text/rnc2rng/metadata.xml b/app-text/rnc2rng/metadata.xml
new file mode 100644
index 000000000000..3c8118378ab5
--- /dev/null
+++ b/app-text/rnc2rng/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>djc@gentoo.org</email>
+		<name>Dirkjan Ochtman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">djc/rnc2rng</remote-id>
+		<remote-id type="pypi">rnc2rng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/rnc2rng/rnc2rng-2.6.1.ebuild b/app-text/rnc2rng/rnc2rng-2.6.1.ebuild
new file mode 100644
index 000000000000..30df505f088a
--- /dev/null
+++ b/app-text/rnc2rng/rnc2rng-2.6.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${PYTHON}" test.py
+}
diff --git a/app-text/rnc2rng/rnc2rng-2.6.2.ebuild b/app-text/rnc2rng/rnc2rng-2.6.2.ebuild
new file mode 100644
index 000000000000..3d843d093054
--- /dev/null
+++ b/app-text/rnc2rng/rnc2rng-2.6.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${PYTHON}" test.py
+}
diff --git a/app-text/robodoc/Manifest b/app-text/robodoc/Manifest
index f6b05715d145..901c7b018bda 100644
--- a/app-text/robodoc/Manifest
+++ b/app-text/robodoc/Manifest
@@ -1,3 +1,5 @@
+AUX robodoc-4.99.43_clean_libc.patch 388 BLAKE2B 394a16b5d0ae62318ddb6ed423aa5194ce03409cb1999494ce69325704cbf9204001b846f4dd71bbec5d579c6a0fd26c728625c7627a2f58c11efb44024bc037 SHA512 a81332d40cbb3fc638beb3867d0a31bf78f9d33b567a81b1effae38c6db67b7952faab8e2f62059e2d95e9cd70d18ccdcd8d75aad2e6744cd8e9f35701a4dc9c
 DIST robodoc-4.99.43.tar.gz 310182 BLAKE2B f8f83c50f51e1f690068b881b51a91369bba3c6b1a9be534fd50887abbf6f06cd90706039865bd0ffdd454b4776ab6e5a1d62dbaf12f459bf1eca0e5872f7e29 SHA512 b9d8758512f6921ca773574ed57763b6eaa203134f13839b8b6f89072bb9a5c0b061bcde816ca8cc64ec72aab7566465ffb0ff2f6a0ead66b50058cb5974fff6
+EBUILD robodoc-4.99.43-r1.ebuild 620 BLAKE2B 6c75df0757db56ebaab1e68ed715aa08fc17a44642a289859bce562c01233e5696d6e2e563f7f39670de8615c4fa29ee9c9425bcd661f6588f9042b827d8dee5 SHA512 8f3c03a4cae79f4795c1828988071c4ee5b39fa222465944687fcc52a235c0780cb648bcccca2d11606be4624e5c1f573789da422b5e33cc7dda7bc9aab1acd0
 EBUILD robodoc-4.99.43.ebuild 570 BLAKE2B f4f805f0bf9cf74fbb6ae70ce65a9d3798a84855ea38d2b3c376eb91de0396f71727f21a0036af952e5ab239b18070ef511b4227d8ac7d3359bf35ea91d82fcd SHA512 3eefa446ac0fd6e89043dd2ab9fcb3c5be48bfb978ba3ac784e8dced8533ae9634d9d9ee7c69be7b5c9621fdec711c2fa1e2a892073940bbfab7d42b4491fa2e
-MISC metadata.xml 458 BLAKE2B 0ec0fedeb47cf44bb16ad0e30fb59dc8c5be8a00f0e08b681228a405cbf9f5fa10f8bfc3bdf6c9b59ff03eb290ef53748fb9d752fd097fdeaf977b47332c3662 SHA512 95ae90341b2c5304348ea4b96a8a98f97413fc250438345617bc82e51ab2407f702424954ae2f8d753ef65d48de57dcb92f96218e2c4629e81418f1c648326ce
+MISC metadata.xml 457 BLAKE2B 038453d5c13c125d7460bb89c81138111b01e4906c2809cc44659c84db131b84bdbb1ddaf6e609afc9b63071d2232af69fbad5f5a471eabc2580c40b4fdf0dc1 SHA512 56cf72fc87ed198624682942e3cad00c9342ed795efddea0954d098f6e159c44b8777e8ccda766aa436079855476ab44cc05d650cd2c09dd8cfb83f8cb30a453
diff --git a/app-text/robodoc/files/robodoc-4.99.43_clean_libc.patch b/app-text/robodoc/files/robodoc-4.99.43_clean_libc.patch
new file mode 100644
index 000000000000..db2b112641a8
--- /dev/null
+++ b/app-text/robodoc/files/robodoc-4.99.43_clean_libc.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/troff_generator.c b/Source/troff_generator.c
+index 1b123b8..94ddcda 100644
+--- a/Source/troff_generator.c
++++ b/Source/troff_generator.c
+@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <ctype.h>
+ 
+ #include <sys/param.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ 
+ #include "troff_generator.h"
+ #include "util.h"
diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
index a746d82a0260..3e77b26bac9b 100644
--- a/app-text/robodoc/metadata.xml
+++ b/app-text/robodoc/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>4z0r@ovidiu.at</email>
+		<email>ovi@ovidiu.at</email>
 		<name>Ovidiu - Dan Bogat</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/app-text/robodoc/robodoc-4.99.43-r1.ebuild b/app-text/robodoc/robodoc-4.99.43-r1.ebuild
new file mode 100644
index 000000000000..df1ddb680824
--- /dev/null
+++ b/app-text/robodoc/robodoc-4.99.43-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Automating Software Documentation"
+HOMEPAGE="https://www.xs4all.nl/~rfsber/Robo/robodoc.html"
+SRC_URI="https://rfsber.home.xs4all.nl/Robo/archives/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+PATCHES=(
+	"${FILESDIR}/${P}_clean_libc.patch"
+)
+
+RDEPEND=">=dev-util/ctags-5.3.1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}
+	doins Contributions/*
+
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r Examples/PerlExample
+	fi
+}
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index d09864326077..537e090ce6f3 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1,3 +1,3 @@
 DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
-EBUILD ronn-0.7.3-r3.ebuild 1174 BLAKE2B 6b37aae5c2d5e5872897820dc6dc9a52a8304d2ef8b23d9f14f945f663224281e9269891f70ac0b921e96f39a4e300001d5f08969ef0dd970ca2442deca989b1 SHA512 f0c37ea098b73e38002ca018acacc699561a38f1366b8736382e63d765893c1e68a5c55aaf29de6c040fe5f26677549769c91f96ef910d4b149f713a73157701
+EBUILD ronn-0.7.3-r3.ebuild 1168 BLAKE2B 65a2fae4a1c0fd9cdfb330085ba8d583cd514a174da72ec1351ef253f5f82105c182232570ec05282debd53f1d166fc96fb55fb389f0c2ddcfe6b226732f6390 SHA512 b691468aac261d823aaf6f3bec508f00697264b84c528278fa9e92931abeed7c9bee5767cd0bc0dbc47712e2a1137a19c79b7189569178d123dcf60ad4b61a78
 MISC metadata.xml 339 BLAKE2B 2a1722a0531a1ccaba0d29a1ace114b95789ba4b0c692e8efcf38605f81de4dd1210671331fcdb5baa6536cf38fbf63f11b85fb13bd6a067be56f22a372fc5b6 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 99bd0305abfe..7619fdf25a05 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index cd18cd4c7dcc..2cd79880cd66 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.3-libsablot-expat.patch 286 BLAKE2B 07728a2d174343133946519934a0b10aa0ea0d2c7e5ba73401b8c16ead71f059f78b24236bc96e17baf2467a5765ce0d82e67e97bb48225a9ba0fc5ac8a163d0 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r1.ebuild 1041 BLAKE2B c47b50e0cfa6f8411fe2c35a839d80458490eccf7b4340e0a4e90fcb3c9125d81441f5403601dbe8214dc37f57ef323042fbc231cad3859e463ba8072f49d89b SHA512 1c6270435ce0e8f6528c9cf417649c739ad0f2e2015a989308385ba7023196fe2311e234ff144864bc8a2db8c83d11ba1080b45225e5b835e46ece79101a2c80
+EBUILD sablotron-1.0.3-r1.ebuild 1038 BLAKE2B 951637f5880123c5326b3a8b05d9e756b7b74954582224daef203b8a285ab1c071267fe4c6ba77da435bfbe382cd8ecf626da766e5a6b2f58256669315afafd9 SHA512 997f719e6951465946496933ebf91498dc8b474d33f108cdcb58303356bc76982306d7d33b9a5c93564dbdd985b2a24e9df80185b1d6807be96c8dd5935e8881
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index 7e43917ffce7..5613dd70e35e 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=dev-libs/expat-1.95.6-r1"
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
index 4c452907bf06..aabe2cfd6459 100644
--- a/app-text/scrollkeeper-dtd/Manifest
+++ b/app-text/scrollkeeper-dtd/Manifest
@@ -1,3 +1,3 @@
 DIST scrollkeeper-omf.dtd 11031 BLAKE2B 47a52f587447f30c1c93ebdb4d1339d714260c7bcf16711591edb0b0f8a41d6694a1f64f0306d0c296c032869176b884adb50762eaa445f50684820effcb9399 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0
-EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1514 BLAKE2B 3dba7020de39f6c5d3cd48c2edbff9007051b7e9821bd76f5b54315d317ff30700a3b0c8efb6a59fbca243f4aa42f36d93055df7ddb933ddc3b2182518ffedb4 SHA512 0c79371d656a1297b78f890e3415be4e7cb3919bd24b2370ceef89e5206bc8484cced0cb20c9f0da843d616e401fd6134580a17466432d35d3feff88e92496f1
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1512 BLAKE2B f183ba4eb645a5d4ba1f979213f184eb736ad41b478b02755cce6a4c1341c7a09bc56d245f13bec66ebb75fcfa528a89de039a01fef6a76aa6d786f8203afc62 SHA512 360e722b9a87c1ebbff77df0275592f09c44128e1f03a7760fab0786ee382c1e2d2c39ef9d5491380777c6c4bb7c95a05661466cf1573b58a1b93e5feeaa5854
 MISC metadata.xml 335 BLAKE2B 5557a7230bee25bc8e1340443746da2d41568635c68904549b2ac2f6227a70444cf2753e6656de56c290c1a96e18dbe882401bcba68e271259cafaa44402a1f1 SHA512 c0180e1504b25daba0b5f2a6556793cf721eca12a4c488a57e7960b9b096129e5f535a24e1da1ffa6b1d9e8b646325edcebd00e5f7e908ace3d81d818e49f8e3
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
index 8def0bd6ac73..bf3a7b353848 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 430ac42dbff9..43b6044c66d1 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r7.ebuild 2569 BLAKE2B 2c5fdd643ea8e866536b47ad246de26678f8e5e15ca880e5c58b7cd7b5e864207dd919ae81b16bb258ab4dc2d8d47d21cf7aeff2369ed77d0986854fc873774a SHA512 5ccd00871f936fe5986576737261aa0ca4658b9e5b160bbc1c82e8e4f1ab0c0b1a23f872ea6b348c2b688eaa67c8a64872bf2f1c0d9ea7dc9391d3d2be4c4e44
+EBUILD sgml-common-0.6.3-r7.ebuild 2567 BLAKE2B 645856995144fd2a1226dea20dcc2634c78c67a8a2c863581b8f674c7d7b9154027f556b7ae2b7001c6047645169b57cd78ca2df2cac5cfb8e2abe2238a4841d SHA512 821f94eb08986576cdd321b42a1739712726cb2d9ed5ed1f7a947d6f2c4ba4b90a0b5feb75565c4db3fc6ca1c1231bbd7bf3724ad3606075c1a7fe76eb5ad07e
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index 81067c555b95..0698baea4a4e 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 # install-catalog is GPL
 LICENSE="FDL-1.1+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index ead363a1271a..b17e1c496ab1 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,4 +1,4 @@
 DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
 DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
-EBUILD sgmltools-lite-3.0.3-r15.ebuild 2543 BLAKE2B 7063eed5d7cd60cea88e9a8de5aa41021a98aeb29f779a8acce925d78ab2aefdc2f25160dae3ffa649676dfcea6b0bf718372d890cca9c466630a578924a62eb SHA512 927eb5c4f03f278afde2701477fbd759c7aaa1a77ac5cf376f8567aa98c67b55116e64d2861fdacb811c20a74a1ee4d44ee645c0a1711c43d89072129ff144a8
+EBUILD sgmltools-lite-3.0.3-r15.ebuild 2540 BLAKE2B c3f2cdd3f0f25cd59311fcf310d9cf44f660203dc69128f0022075286fa796ed7794e69634938515bd41a07a5c6712271dbc050c90c23ecc3b99bfe85d6fc343 SHA512 ac06017cef0a725d02f02de77f5164ccc6524bf70c63bc5bdcd4680349fc2de44ee1e3226a32a6153f09af3c0326292a57452937de2d55c1d6c64a8edf3974ed
 MISC metadata.xml 493 BLAKE2B 36e972b80b557e131d5decb41945968ce24de810197ea457e50081017e50e3926baa419082222cbdfb494a55e9bae125bf304a431234efb4c4a67a8c3536852a SHA512 9f2e53faa5f07d791f7c4cfa7972ed42a26d1abfa5c11faf3e36dce18c2c30d086462e9c0a2c7664153333cb10c3923d47b4bb9e873b7e48dd144e667719a14e
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
index 1f132e063007..d315d8225bad 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="jadetex"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 54a7830ae2e3..a1d9f7a34606 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,4 +1,4 @@
 AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
-EBUILD t1utils-1.41-r2.ebuild 653 BLAKE2B 2e256967168c5c90a7ec412c784e1db0f3bd63c67b5ba8d2ffef9535a5de8fe98c7d2c98f7e9219eeed706df5600353cd645fda5ce90dff31150ff01db3a944b SHA512 2279f151d2f21aac8221a2cd14499bca392ce1457f7cce4971d31856db188025d49b045c5102363a2b3359e69a57ab86940007bf3f77bea67c0fc17ffe8ac08a
+EBUILD t1utils-1.41-r2.ebuild 650 BLAKE2B 7df9dff83fb2cc2c85e3ef853a8fb75f03fe8f7e26798165246be29a85a8c886e72f590a7f90d87d488d90cda4fb4b944b2dc88d1ec0d42ab0da95ee83c7f649 SHA512 965c4264781241039711c5d9ca81b426750183960150583965b09558ea4213259ce3e261a792416db9985840939b9f5de8450261f4f2ba97172a8e1b36a6eb6e
 MISC metadata.xml 347 BLAKE2B 2f19fa13fe0a6a3f521653e00c787e1e5b61a0d53ef30e06efb6ef104d560e90417512d9e72bed79f51a81bd465494ac469f23246705876cfb91da82fe31cddb SHA512 6a4884011de9218a6c0417b64690cc76c9c5be7a525f4439fb04e70c3ed287080fdb5707004d611107dee69230bb1f892078260bd18dfe7aa824d88e23dffc16
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
index 0fa3dcfe9ae0..58f38fa7ae41 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index f9aa9748232a..2fef4a699f4c 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,4 +1,4 @@
 AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
 DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
-EBUILD teckit-2.5.6.ebuild 1112 BLAKE2B a30414fc9ada740895e85bbbd4acf60d4f8c860247d33e538043993a0e9aee7d68e80df5665324fbaa6a8698bfca6226055f046b356de198192d0bd41de317d2 SHA512 e04781fd5746662ce06af26badd5254264db582701a88c22633fb7f06587d2b725fa2c67d13377a0b38dfad5eb25d1354b4b937baecaf5ffa426d56c41a6b7de
+EBUILD teckit-2.5.6.ebuild 1109 BLAKE2B f88b5ca5225ca1cdefd624449b553727f2891dd51841ad73471f7f818ee5743afecbb5a90daff16c1aeec5d8e4f3efa2f89aac7f17f4a5bb35aed23ca1614478 SHA512 9a0c709d24a6061977b02b4db6a9421973698efccef736a0eff342d22769ca3e14ba1a6186ad0d90402b0ca52952e680c45dc97c139e0ba7c449b184e793fd6a
 MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
index 22ca3114d848..6dfa82d29799 100644
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ b/app-text/teckit/teckit-2.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/tessdata_fast/Manifest b/app-text/tessdata_fast/Manifest
index ec957d75fe58..7bb44df2bbc4 100644
--- a/app-text/tessdata_fast/Manifest
+++ b/app-text/tessdata_fast/Manifest
@@ -122,5 +122,5 @@ DIST uzb_cyrl.traineddata-tessdata_fast-4.0.0 1563501 BLAKE2B 4a57310458de8bcb6d
 DIST vie.traineddata-tessdata_fast-4.0.0 531275 BLAKE2B 379070086dfd362ef888b8a467ce003d32653c844fb42fd89a5bcf383b58cfb7b9c170328e49c4800b4f43201600e43e26c7745f444e06f5ba7bb93e8fb98e72 SHA512 3a055b7ba07e38ce4a21be85ccbac26b27aab5f4104d4875c866030d0ac6d468e25c793301c2cbb4ab5ff92492bc5c02eefe083d638f6c081cf19ca452a05733
 DIST yid.traineddata-tessdata_fast-4.0.0 545606 BLAKE2B 96d06916e67e5712d708d6c4534b3a618211cf76b3825ea3b48ac04d8158633a5fd0584aecb2574fdf105d0ba8d9ed21861d3cd9e6fa186c273ed950b9382a1d SHA512 4ee1effed6fd9233d6341f62f5dfd0a4dfb25e7388c7152bc3bdc55dff0737198f35264fcff34d81c223e4a8be832417323f9e16c4c33245d0493d44eacbefc5
 DIST yor.traineddata-tessdata_fast-4.0.0 963400 BLAKE2B 38f84a1c331ef161cf3d6bb25e8586d1cd5fa0458fcd295fec3481f3c02cfe3f9f138c22731af3beec09471570b5d790917bb42ac40e5597dd5336afe2f55cea SHA512 da4d086f52534fbf01ac00dd996aceb2c646fc61b60199cf539cc7a223c050e69079ede591b95abbe1d3927a39ca7f9bedd68c558e6df54d949dff5c6428f449
-EBUILD tessdata_fast-4.0.0.ebuild 2207 BLAKE2B 008091b23ef5521d4da73bf2d7da1f41d7330740fd58c9eda2e51d19c94a5b1e8470e0e6e187174cc184f1b260ab9e7751237be63725e3cc3717c1951f595d01 SHA512 89d73e66b108243a9e86c11912a570c3cbd7fed23a3dcb7f91ed2defcff7200f7307d13b7de9fb6889a7682d5e675613583c63309fbe671441fde1ad552d4d62
+EBUILD tessdata_fast-4.0.0.ebuild 2205 BLAKE2B be5565e68d2f6257e5e5d47482cae2e7767ee0788f4f5e86164835e2d696a5868e57d60f063f6c67c37b2b6d2731ea78a77b1b36f37fe0c5b77fedf40ba9f057 SHA512 cfdf1680f0097437f813e483e4f6f161e4e588894fcd165344c83841c80301a630033d4a06b6d1ded962b3c50860f5ca7bf00c4a8e48c7832ac57ed4e89917d6
 MISC metadata.xml 559 BLAKE2B a8bbc3bdea38cc1634f27ccfa49775eb7fd8457cd74bc57264b2f953c040c38f9094cda82f9119960f6a95e022616ba0258b26ed2c1bb83215d8c52fe7ff9518 SHA512 8e6c81101097d1449698ed7b751b74a942a9d88f2cffe6a2ca0669ecdb7a2d2a1619af18b539af1fb538456d5cc64ef0edf3519793baee37cf2bc5be6e025919
diff --git a/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
index f87d68977662..eac313f7eaaa 100644
--- a/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
+++ b/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+osd"
 
 RDEPEND="!app-text/tessdata_best
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 6a0d8b412844..4e6b35719d20 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -48,6 +48,6 @@ DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
 EBUILD tesseract-3.05.02.ebuild 5845 BLAKE2B d5b83ff146d960a3b4ee13be151c7e1083b038b308c17c55a41b8728dfb3251bd7fb7b8a32e1fd4c9c3405d240f46a312694e7547786e169d7c44253bcf68593 SHA512 8c70b8bb9e09c70f767286cd9a99d35c67f4a59e0f7867968b16bffa0df9538a135c5f2dd774022b6035bda40cf51b59c9c3893078fe41581a72e1fbe0f379e3
 EBUILD tesseract-4.1.0-r1.ebuild 2059 BLAKE2B e817adce0988a94490891f6cb246636cac20f6552852fa2d684546402822b4cc1736e3e50cf390887e7921fce797fe8271618209d49cff076cd989e65e8ec349 SHA512 e3e1ba6bdb0edc304e1ad2b14ae07cef5469f74cfc9e863f4b84761f6dba75ee3b328c4701a720cc4f50d99165d9fefb2f236f80d902bad67c8b2955f086031e
-EBUILD tesseract-4.1.1.ebuild 2059 BLAKE2B e817adce0988a94490891f6cb246636cac20f6552852fa2d684546402822b4cc1736e3e50cf390887e7921fce797fe8271618209d49cff076cd989e65e8ec349 SHA512 e3e1ba6bdb0edc304e1ad2b14ae07cef5469f74cfc9e863f4b84761f6dba75ee3b328c4701a720cc4f50d99165d9fefb2f236f80d902bad67c8b2955f086031e
+EBUILD tesseract-4.1.1.ebuild 2057 BLAKE2B afd7904916533fe1152e960c46cef0c36a0aa3a5259f9b5f385ff0586239cce49c829c312ece1197821a45471b61336907117a97add0730235dc99c17fa742a4 SHA512 03f2de61b918dcf29d7ea0ae9682ff5e7c6be8559f398ccbdea3ba6464e05ee64d4db0635e02e96e6564227c8cae1b1224419b6d6edc1e25e1ca306cdecc9b1c
 EBUILD tesseract-9999.ebuild 1985 BLAKE2B 61ca3f12ce35a89999de392f8f96a3a55571c7b37a10d59d28fbd8a14f97ba3eea2c96ea17337ace2a6ff768f3bed96efbf45ca0b3bd5cca79ebb0edf15d8a7b SHA512 4e84e0f3a68232333182b1195ef8b443ba95575bd5912acbbe306788d2174ead368becd43fb1d7daa20b7d73e136309143572322b85860adf05826c5289e5023
 MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/tesseract-4.1.1.ebuild b/app-text/tesseract/tesseract-4.1.1.ebuild
index ac660c1f07d3..55c497c2cd1e 100644
--- a/app-text/tesseract/tesseract-4.1.1.ebuild
+++ b/app-text/tesseract/tesseract-4.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
 
 COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index a8a9d43e45cb..d0ef874a8401 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,3 +1,3 @@
 DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d
-EBUILD texi2html-5.0-r1.ebuild 1351 BLAKE2B 7bf87c9410d22dc93658bd66c73f83b675689f04fc565fcaba351f3c5665b1b248dd3d2646ac43a285b62ccef32a9c15e8bc0a76e7d836ca5a17212457d586c1 SHA512 b8fc14fdad4dcffa5feab8108bb0212cac885891c1a5d2d9543847aaedbc57c89b232c83101890d86e2dd11aa3ffa218cc5433420c7095dfe7eb1d56448886be
+EBUILD texi2html-5.0-r1.ebuild 1349 BLAKE2B 84e013c48206daf691e8cb6ae15d1a06e51e2da69af03b5b4e6753ef99c9172f9a5571d1c2e47473ad1aca2b6885aafc7d37ab2ce48a2f27b611edd97e3c8562 SHA512 96e9f654fbe3bf163aa0e287047fc1c727b4c8273f1f5c1dda7926d2219446a34e1682fd137108b704512bef839b5db616a1feabb93f9a1d30958a57847e4664
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index d7cc53966028..7caeeb4c3958 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 RESTRICT="test" #411523
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 2642fb55a7e1..c40ce1fda673 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,6 +1,6 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-DIST texlive-core-patches-2019-4.tar.xz 11932 BLAKE2B 5e73e2bd3afeb904f2b8898081ffd770c9ab152368ae5a8699d5f63507e3c0584901d7d6f8fece7724b8e744d7816fe31db4b96962c0550491a57a6d51adb296 SHA512 fce31563f8c7e8f1f0bdcba9c5108d9f5d14529c22c110e33f32a6367560f7f255e51a1e86f1d5c8fb275085ff3ba6d0f5f474acd79ff61d67be795dfb330708
-DIST texlive-core-patches-2019-8.tar.xz 15172 BLAKE2B 97ac7855200fcf86463e09df1bdd30f9ebf50e8d207a136ed9dd380776f15d0a883b5eaec22ede4ae9e5201dc47cc40854e1ac77d197fe2bc8c0f5a1c287c1eb SHA512 1a9af52496a7cb4f8e0223811ac84e7adf6ff8d63ad1c29d5c738716e4a45db1375e3f67324104e6a40a93f68de46d7326b3e851a4e33ab66ae562667e4a883e
+DIST texlive-core-patches-2019-10.tar.xz 15384 BLAKE2B 0715e8553db296eb31f88791010c8e5c383758d0ae0b99effdbecf3dee029a865cac594c50262137c33915c3ddd9bdec0daaade9979b932444ef44fa4928fdc2 SHA512 166bb4440e824fed8aacfe0a1a62aa64403c6cd23bfbae4d65b6ee8822d29a54d30664068f0d65b49b30586691f75a21bb3719e41c75481f5cab72e82d0be1a7
+DIST texlive-core-patches-2019-11.tar.xz 15412 BLAKE2B ac0abe035541acf2b4c028e310616a72e47c4c59826535a667bbc439069adabd5c54260d7724ae663ea0d36de01cdf363fa1c3472e8c53b19029fb798d432e53 SHA512 ae624bdbd172de373871dd8a1bd0d8c2e810e89e471705de393caf351d8863e71558ca021a9365821bbcb73956642d8a65f670431a7f94774080e6f821fc1d92
 DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6 SHA512 983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c
 DIST texlive-module-a2ping.doc-2019.tar.xz 39740 BLAKE2B 1a9cf6e4cf4dd4dd7677efddafc9da191ab3c34eea3b7bd0f51937f6946e1696b858aa9d53e7599c220933b06bc0332869a0bd596ca66b9801b48adb5ab1aa2b SHA512 daeefb01a0197e3b7751614cb84e2926f670d36b7e8a389bfbbe39cbd941c4d10ef5112593bfb88e11fa15f7f7bb07f2538c7d0a68cefe1482bbdaf02d475512
 DIST texlive-module-adhocfilelist-2019.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
@@ -157,6 +157,6 @@ DIST texlive-module-typeoutfileinfo.doc-2019.tar.xz 756 BLAKE2B 00d7c631ba681599
 DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25f991568c53cef0d812be7415f8979e4da38ed14ab9c6d97f3b2aaaf62720816822939d4e79fb7a18ef77f0025317035f SHA512 0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b
 DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0
-EBUILD texlive-core-2019-r4.ebuild 11204 BLAKE2B b90ca2c333af24fcdcd14f9b8040d918c33ea481631f60a69337585dcb3cd6ceba1f343159bae31d842d3f47d5536d9e464a0352b0a8bf4acef1b26eaab3c467 SHA512 850e9bdd5f67a867ffb77aef6416f35b00203c49c1e7f0fef003a9314a71ae30a7d6632e9c6624286d2d67cd2f6bd270e6fa7fd1178dfcee4f43abe2e6167b8f
-EBUILD texlive-core-2019-r8.ebuild 11567 BLAKE2B 2efa686d908010c3e0dd8d858e4993f573970f61da72f231dcad1fc15b5737692ba30d9ab46f9c841491682134853c59b0c08bdf204262054c9c1391cae01228 SHA512 f77c7da05c36a6615cbd13324fcddfa7946ae1fd2b2e98b702aa9fb0e4004382deb7a3ec3e69d36f684c023f4e3b990e7372e53a55e9620120c8749002f0093e
+EBUILD texlive-core-2019-r10.ebuild 11695 BLAKE2B 725219e83562121498c462d3043444e39ae2e299cadcfa852ccefbf9ea62a65ee1a0ba78c0c33a24a253c53f98b0b53c29d4ae32831b484b022757f1d1ccbb35 SHA512 b99844e08899d3201b7cb2cdc990512f39a9637793102065a12fc348cd5d0fd51f679c73cfbf3839f13c848e4bc786426ac3eff68fdac1a539a15e14a45498e8
+EBUILD texlive-core-2019-r11.ebuild 11838 BLAKE2B 44f82f1519a47e13145ecbf8148ef42c96c0bbd0b6ef8ffe2d6cf0cae36c20e85180d989678f1904d661380742e1e55e9c95d9ab3524f080c2f92ef4051f9fb6 SHA512 b233eaa3e54851199b82194d63f07bc7fff9d24396e4c3caa99de17eeb16cd335a3b5927b525bc50d218658aadc65869b2d8d496018f65da6d362c814ddea721
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2019-r8.ebuild b/app-text/texlive-core/texlive-core-2019-r10.ebuild
index 093c3748dbda..5cbe8b18298d 100644
--- a/app-text/texlive-core/texlive-core-2019-r8.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r10.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common
 
 MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
 
-PATCHLEVEL=8
+PATCHLEVEL=10
 
 DESCRIPTION="A complete TeX distribution"
 HOMEPAGE="https://tug.org/texlive/"
@@ -72,7 +72,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
@@ -153,9 +153,11 @@ src_prepare() {
 	eapply "${WORKDIR}"/patches/${P}-no-fcommon.patch
 
 	# Conditional poppler patching
-	if has_version ">=app-text/poppler-0.83.0"; then
+	if has_version ">=app-text/poppler-0.83" && has_version "<app-text/poppler-0.86"; then
 		eapply "${WORKDIR}"/patches/${P}-poppler083.patch
 		eapply "${WORKDIR}"/patches/${P}-poppler084.patch
+	elif has_version "=app-text/poppler-0.86*"; then
+		eapply "${WORKDIR}"/patches/${P}-poppler086.patch
 	else
 		eapply "${WORKDIR}"/patches/${P}-poppler076.patch
 	fi
diff --git a/app-text/texlive-core/texlive-core-2019-r4.ebuild b/app-text/texlive-core/texlive-core-2019-r11.ebuild
index d95f3425d1e5..f8867fc856b8 100644
--- a/app-text/texlive-core/texlive-core-2019-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r11.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common
 
 MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
 
-PATCHLEVEL=4
+PATCHLEVEL=11
 
 DESCRIPTION="A complete TeX distribution"
 HOMEPAGE="https://tug.org/texlive/"
@@ -72,7 +72,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
@@ -133,10 +133,12 @@ src_prepare() {
 	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
 
 	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" || die
+	{ for i in $(<"${T}/reloclist"); do  dirname ${i}; done; } | uniq > "${T}/dirlist"
 	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+		if [[ ! -d ${RELOC_TARGET}/${i} ]]; then
+			mkdir -p "${RELOC_TARGET}/${i}" || die
+		fi
 	done
 	for i in $(<"${T}/reloclist"); do
 		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
@@ -148,7 +150,21 @@ src_prepare() {
 
 	default
 
-	eapply "${WORKDIR}"/patches
+	# These we need unconditionally
+	eapply "${WORKDIR}"/patches/{0001..0006}*.patch
+	eapply "${WORKDIR}"/patches/${P}-no-fcommon.patch
+
+	# Conditional poppler patching
+	if has_version ">=app-text/poppler-0.83" && has_version "<app-text/poppler-0.86"; then
+		eapply "${WORKDIR}"/patches/${P}-poppler083.patch
+		eapply "${WORKDIR}"/patches/${P}-poppler084.patch
+	elif has_version "=app-text/poppler-0.86*"; then
+		eapply "${WORKDIR}"/patches/${P}-poppler086.patch
+	elif has_version "=app-text/poppler-0.87*"; then
+		eapply "${WORKDIR}"/patches/${P}-poppler087.patch
+	else
+		eapply "${WORKDIR}"/patches/${P}-poppler076.patch
+	fi
 
 	sed -i \
 		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 3066a02e6e9e..44166cf55b5d 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2019-r1.ebuild 7240 BLAKE2B 40d807b212e70477699a692de35d55fe3f82aac13469779dd60dc618c3af91e0bb9904a113fc8f7d5c393f494f180149562e4539acbdf32204e8b041d51bbeaf SHA512 957ba4980378e83ed1a4e27ad4341c741ab8a61c47bbaea678b0eb2776617f67a8e19a3e963d970865524db1dbb817e680bfcbc80aab99031115a96c5f24f0cf
+EBUILD texlive-2019-r1.ebuild 7237 BLAKE2B ae83e943ec740464e14325c02925947a6a3ed50301d0a44b1123ae59b673b632d830c816f04f69d10f60ad86856cd7c939f38d6564b6b82b83e4abdc5d1abb48 SHA512 3efeae560b6e5a2eb9bf252cd8dd8dc2f1a315f0273ee99cd96a49db66a2090b829468b21950ca4ecc37407cd44ef062c287bc80ed1e31592f0e2b9fd88f08cf
 MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/texlive-2019-r1.ebuild b/app-text/texlive/texlive-2019-r1.ebuild
index 0422bc6cd89e..0e5c128a92ac 100644
--- a/app-text/texlive/texlive-2019-r1.ebuild
+++ b/app-text/texlive/texlive-2019-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index 02a8a32d91bd..b967843db09c 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1,3 +1,3 @@
 DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
-EBUILD tidy-html5-5.6.0.ebuild 635 BLAKE2B dcae127db483f4a87c07ab043a95639bf9ec5af9b47b576948cdedce0b53919e9bc3d042d1e6cb9b9f2506cd01635b29d2a16992d846e388786377e03f721e6a SHA512 45f8af2ac6eb34297a4d268d1297141b622c22c1282d801e6af40e8366e956f730af28b55e1cfcda85184319352e5c1d49d09d38f50ce29df291004905955513
+EBUILD tidy-html5-5.6.0.ebuild 632 BLAKE2B 9b39458cabdcf3a5752d949f882a57e93fa044e61249be899bb235c8b7ad5dec3736adc57688c4dc67ad014b97deea7a3334931e870b0cedd3970504a3deb5e8 SHA512 9913a78b0aeed41f9eea466333f1f156ab2a5ca64440ebe5b57aa506a0c78fab8ae02449e7a7ae2d5dff2ac18a0c700c56bec60557208b5440fe3214cc432733
 MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
index dbdb1283d9bb..b028fa4e8e1c 100644
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="!app-text/htmltidy"
 
diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest
index c47a3fdbfdc4..3a3647afdfcc 100644
--- a/app-text/tkinfo/Manifest
+++ b/app-text/tkinfo/Manifest
@@ -1,3 +1,3 @@
 DIST tkinfo-2.8.tar.gz 56234 BLAKE2B 6351a8c3ee46092a5c46db147006cb462882cc9abec11f49f07f4f4b50888be6537625a0756a8f05837c21d769345e39837f650ad3a6488713adc304880a3674 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76
-EBUILD tkinfo-2.8-r1.ebuild 576 BLAKE2B 5e5fe1dfadc72deb91fd7998fd32f11e289605152e30c9f3e778bed7d8bd754ddabb391f01c21a660849e0bf6d59a42c68207b60939051fecb74bdbee01cf675 SHA512 771969a0284d5d21b156265b232bc467429c7c9a9f2917ca8d6a893f5cc5ebb7b271091c25bab7a28d761c2dc9f164b1c37e3b7bd87066a336dccf4cce7eea04
+EBUILD tkinfo-2.8-r1.ebuild 577 BLAKE2B a57c2355509720494b0cc0b47751f4108fe2e77c6ace003c39f3673e5b3735be7a109bb91a3abc7281acbeb5f5fab6ebd97c453147d1f3b2af1fdb7d4529bdc5 SHA512 a7f3850eaafca673044b54dc5389866d7436d61a853b095755c63f27e1daecce68fc426646c5ae2f4426cd9da56020949afdde62f185c822bcdeb1fe76f845eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
index bff5686e6c96..0180c51ed4b6 100644
--- a/app-text/tkinfo/tkinfo-2.8-r1.ebuild
+++ b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://math-www.uni-paderborn.de/~axel/${PN}/${P}.tar.gz"
 
 LICENSE="Old-MIT GPL-1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc sparc x86"
 
 RDEPEND="dev-lang/tk"
 DEPEND="sys-apps/sed"
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index c195a827d0f1..e9c4a8c70d86 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,7 +1,7 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
 DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f9244534393527d5f344835864e2acff3b2c43ed406d65657568b21440044af21fed2c4ab623e88d2e396c SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
-EBUILD tree-1.7.0-r1.ebuild 1077 BLAKE2B 54aa6396e6133d47bbe177a90f26a0ade3067234f1daa7839d43319e72216231c6dfbd580896278600c82814bb9675855e2289feb8d7195d7ba714a747bbabb5 SHA512 394215eccd5bc26a4acdd444408b263438342159d188fbc719aa34024ed72d46f103bcf3eca3089c204c2d5da1b05ed7d88c89f5771a523601c6f3c2ac003723
-EBUILD tree-1.7.0.ebuild 1058 BLAKE2B bd4c0991418cd7062ccffbbc063c2d7d25397c4279951af759017c3989d38b27a3d84429e9c8672209643449a73d6525b75a303d49812611c93d4dc6af2f464b SHA512 df5080d34e4cb1f9257aeebb8481f94df36f6d4635190140a4585f920cdda004bd430a7236135e5e8ba7ee2532dffaa327c5d65c7ce0d81975274be30bc21807
-EBUILD tree-1.8.0.ebuild 1053 BLAKE2B d99be9d907d49d58263c444afa7954f5256f30446f2497616ea4185a5ead7c9cb00e6035151278282e02a3214dba404ea6f42587b159834e8b6f7dd14e52b1a5 SHA512 5747dbedaa6b5d4e6f737e3798d171ea26709b0cf0a3bb20ed1f97dd70da9414829e716948aeef77679ed22a8bc9617961c61a2c8607efc6a8a95cc4593feeaf
+EBUILD tree-1.7.0-r1.ebuild 1073 BLAKE2B e3560608b4163160461ad68b090f2c572f5cdc261064ce8316d9dcde7f26dcd54dad5ec9e49a7adb30cd76320e970c28c8cfc1da86a28fc544f34c0218f9e94f SHA512 0aa47789f61b067dc8191b3193dc402019df557693565bca63e6c3bc774d85c203ddf2a1ba430c7e23ed7164bf44a647261f9912df9b2596fa492f475d067067
+EBUILD tree-1.7.0.ebuild 1056 BLAKE2B 9df63e2802ad1744647bea6c4c5696dbb1e22e286355be82fa332d694361626b81a6af55ed268d5bcb60c4a8bdffca8469f9b41d3afe6393fb282364f98f0bba SHA512 52620a0b0927c85d5732fe27bca631f9e21f643d38fb2da311c4ad25b3eebeb890abab1536fcd391f1febb7551a81becdb0e46d3dd7ff02a05aa0f15ed4ff2c7
+EBUILD tree-1.8.0.ebuild 1049 BLAKE2B 08331028fd90bdde4504ee8eb3117d0e89f14e6f42430facc827aeb29a82618e507397c9281cce46330506b97dbe373c17855ccdd714474d27be830304b92fdd SHA512 b7775dfb89bea6ec7ed4c919222221668f7a83e4624a7180f30d92ce8da1d73b64dc7b31c4ffcddb39aa2286c4161bb8ce5fddc3cf39b08d621d56fceb08da7c
 MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/tree-1.7.0-r1.ebuild b/app-text/tree/tree-1.7.0-r1.ebuild
index 635e68678446..b76daa598d94 100644
--- a/app-text/tree/tree-1.7.0-r1.ebuild
+++ b/app-text/tree/tree-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!=sci-biology/meme-4.8.1"
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
index 6da7793733b0..eaf064d7c2df 100644
--- a/app-text/tree/tree-1.7.0.ebuild
+++ b/app-text/tree/tree-1.7.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!=sci-biology/meme-4.8.1"
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index 4737aa83e4eb..849ce56f1ca5 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 57cd812d1b46..87a0f65aa4ae 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,4 +1,4 @@
 AUX ttf2pk2-2.0_p20190410-fno-common-gcc10.patch 266 BLAKE2B 98f39f54a57008124d456d831fa02585de3563029acf520b47253510f1c59c1761b450c0b116f372142c9c197aac10b50edfdace60bd66ea9d3791f95556778b SHA512 c65aa9af68ed6073427f7c5713cf4157a1fa7782578612a26040ea50eff89c41251e1b36a395b2cdf639d46cb865abfe46f5662e932d29e6e10bce08dd48b5a7
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ttf2pk2-2.0_p20190410.ebuild 1159 BLAKE2B 519047a229ac9071f1f32d8137e347a49dce542a72ce0814b08a4ebde254663541ae5ee4e82c2639c858a3f2f9be7422717c47141cfa1c05436a882855e70eac SHA512 2828785adb3c8f522578716abf3f6fa280384e7f1a2c5ab2b88b1d4f5f06d695b9970a789a32cfaf46497874bdc7f1d2ff25303442c46d6d31ec625a574288bd
+EBUILD ttf2pk2-2.0_p20190410.ebuild 1156 BLAKE2B d788c4aad0b3dbcd4dbf641409ae219757e13e0c51250f03fe0e12b19a9acce54a4ea1c66dd692dce917e970df4ce0c458132b00c4a27bb1521beb75879c9dcd SHA512 a45da44b6803f2652ec7f26743d326162fd9b78ef1b06e4b7229d333a70aca78ce158e456e16b8d2dc689584d370f6476ff3caa0510255cbb91e0ce47216a41a
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
index 6528f2d15c05..77a7cf88396f 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index d6f73ed9e908..7bb57de45a04 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,3 +1,3 @@
 DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
-EBUILD txt2man-1.6.0.ebuild 608 BLAKE2B 0c8eb783e7790bacb0ebc51318ecf1c72de7d23a6f4b7e3fb49613642969c3641a8cc5f5da7b7db37ab573cc5480f56613e4e1e2c83358157f505140ddee9cae SHA512 5c299921fd3170f17560330b64e0676d71dfe99a225c656101137faea382fffc6acafd5c4d2c5b5d8d14b2f18e07ad78c7f6834428b0c29ce41d8ca5652bb5ce
+EBUILD txt2man-1.6.0.ebuild 609 BLAKE2B 5791269461f773391ba2080795d7689a9347d36bde85bd2152e62f7215368c47df1e82f2b31d7827c6bb2765976871e31dee9cd06efb3b4811cc657d72332f60 SHA512 312045664e536ae8147e641fda6a3726ad629682f1fe3ef1696a8cd8163fd115ee6082747612157e003cdc62269e108afff65d75c68d505d4865092923bf794f
 MISC metadata.xml 308 BLAKE2B ed6f6f83ed571ef3966c646eb0b58cb8e711f9ddce51fe8e97e0a961c5d2c88fbce7199308f5460005a393ae8b1854037e152d81290e97aba71465d96cc67159 SHA512 bf9580b121de871786c26826a398b5e0c5108b61da60fbbd797a6ff58360f7c983541574bddcf4ee8809ea0ca603a4bb1ace88e725484227fe810a44608ed51b
diff --git a/app-text/txt2man/txt2man-1.6.0.ebuild b/app-text/txt2man/txt2man-1.6.0.ebuild
index c53e3f94b657..bb5a6e2796c2 100644
--- a/app-text/txt2man/txt2man-1.6.0.ebuild
+++ b/app-text/txt2man/txt2man-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index 8b58e9ef131c..615c717786ec 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -2,6 +2,6 @@ AUX unrtf-0.21.8-automake-fix.patch 191 BLAKE2B ca81dbbebd8ab2ae786e6291018ecae8
 AUX unrtf-0.21.8-iconv-detection.patch 301 BLAKE2B 53d3125d59e44da9c539a13f76d99828be94261e61e367c3582da17cb8625caa75accdd38bfb59b6a7e15a3879ed8ecaf62df3ff26d5e757a86f963ef6c3094f SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
 DIST unrtf-0.21.9.tar.gz 828590 BLAKE2B 832ab672265efa8f1ed5dfdcc73e310ef920199db57cc2be5303c7d0c502a15e7027cb9539ee5a27df66e2589d9dce88aac40d465f87d39770de9c4b5d886b8f SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03
-EBUILD unrtf-0.21.10.ebuild 413 BLAKE2B 59796fcdbde38127d2f6de81ed1ba87bd96d127c899b18da895e0dadd8f9d1e7dbd9d02b12084d3181f5649d1d0cdd31d420985d330dc78246932aa55b3ae42a SHA512 4c88bb41463e5e9ce7f49537c4c937960111710101bb557d26cdb092e1eb6a03c520c2b0eff0379873af26da2cfb0811f038a1399fc5ef762cef8d6aadb36e06
-EBUILD unrtf-0.21.9.ebuild 733 BLAKE2B 8705a2341214e8cc1f051b2a6a8aaf62be94e58c5d9023a843c8e09317f02820b09342a540b15dcbb571bd0c7beee9faec2308ebb168a2240db2ddbf65c89182 SHA512 188341ac9c3172b308678239701a29778663469bc57565ef9375665f8807893f25e8471a7c498ad97084696bfd7229acf046dee8f6a3bb5e37461b435deaf8ca
+EBUILD unrtf-0.21.10.ebuild 410 BLAKE2B cd3520f0d3fc77ae683afe34210b2cd6c93d293274aa944f9f23df3c2d19b4856fc95525e2c8a82f0d72974eba1db24ec3704f866cf1e7af629826a231821ae9 SHA512 749fdba434a8788d2ede21351de8d5fa09119b3bfd4c1652ad8e0053ea7480243b7e845ae07026de447e4e9abbaf682a510f883a01d456cee280ce35f39466c4
+EBUILD unrtf-0.21.9.ebuild 730 BLAKE2B 222ce4105c497644f5fa5183b71f9e6ce5e4750cacbe3e0b0eb15fcba31f4883ad1fb599d34b024b8f122fb82cdcbbd331950397009c62b0723fd1ddafc471f0 SHA512 e592ca14d15900ede6345f4e64ceb7a1451dded20be5f0dfdfa607bf3f6123a79cbf9a93cae4376388d692cbf9fb38a9d710e27ddcc086e378216b016189f8e6
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild
index d792e532e39d..236514708983 100644
--- a/app-text/unrtf/unrtf-0.21.10.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10.ebuild
@@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
index 4ba96a959dd6..1bc242caf1b4 100644
--- a/app-text/unrtf/unrtf-0.21.9.ebuild
+++ b/app-text/unrtf/unrtf-0.21.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-text/vlna/Manifest b/app-text/vlna/Manifest
index cbce3bf2280c..cbfeeb0cff08 100644
--- a/app-text/vlna/Manifest
+++ b/app-text/vlna/Manifest
@@ -1,3 +1,3 @@
 DIST vlna-1.5.tar.gz 146670 BLAKE2B a72cae3b276bb0673dca940d15df4ec0af8c292bb08b0a0ed55680d6893a3fbf80de9588bad4698c8c12f056a9a66650a63c100ea3021d7809f57cd2b9b09d19 SHA512 2416fd4183a5be495fa538d05bd8a7514265c4cb68d78aff6f2dfdd4b3c9abc34b6eb829e5adb6fecd20aa5d110ad77d9e0f56f260ac8ced3ea2218cb6cadee2
-EBUILD vlna-1.5.ebuild 493 BLAKE2B b76a8f8f1f9dafd31ab53cdb6ff7ec7d387d99d46368204f9eb9a67780270accc5078804030bbf1b22c28ebc583d589380c7cc01c1f0424dc3125a3da7fe685d SHA512 b1727079f4f3ba05c31a57264c4bf9dbad5e6df2ce99b71553ead8200362ad1dfc2d6b7494c3dea7302e42049da765f0552e88d724820fcd6cc0c05d311ad883
+EBUILD vlna-1.5.ebuild 491 BLAKE2B a4d8857f3fd52acdf6af3293afb65edcb65695d1e2f5bc4a6a92a8c6e522363691ff23c72770a4931361c555757db644871674b06a050cf78f92c0009ea3fd8f SHA512 3b99784dabedf644f87e045e922703f1f7d4579a9fa920cbe6c74835a279ed996923069ddbde7c9069b53f81bf8afca61c95a5b66fc4a69a0fad3376e03f330f
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/vlna/vlna-1.5.ebuild b/app-text/vlna/vlna-1.5.ebuild
index f2013ad1936d..0a92337cd499 100644
--- a/app-text/vlna/vlna-1.5.ebuild
+++ b/app-text/vlna/vlna-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://math.feld.cvut.cz/pub/olsak/vlna/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_install() {
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 177161094d8d..8646ed317c8d 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,4 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 890 BLAKE2B 6166cd255032106697bcec4ddb6d16241eec5bcc4acdea7a35168e53e562171d34603c2553d332a7d0b461e7a61935596abf05c0bbdae4ae7b0fd0f7f8f1e081 SHA512 c775b29778cfc4084f41cf7946b99124587d27204e255f85aa48e3fdfa79913b123246889e8ca0f030b85b2f1fd1e937fee63f559a2aa1f8fa25f5d1bc1dd8c0
-EBUILD wdiff-1.2.2.ebuild 854 BLAKE2B 9eb6048abf720ba69d04c412aed20b8c10ec69b618a29cf84faf272ffff6ff5c558e64c253ae8763e7925541c2fcca4b7ea1db6579b403053ef6a8c747752afc SHA512 62adf40b050b4742894898cb8bc8134a61567a6e48bd20abb836f516aa141a6eefdba4e2e230a01c232c24885fa5b1d026d363b6897860828c32cddeb9e7b615
+EBUILD wdiff-1.2.2-r1.ebuild 886 BLAKE2B 6c3eba64514a8d48d3c681c56e1af19d05b002b3f9695adb806a1ace888bb138e56939666bd006af052845b02fe6e15c9112d32d8f362c3ce3cf09cef0d06332 SHA512 b1928126854f4f2f1cf609b30d94818c72e90897aea2bb5df93afe70e408ad5c7e537c492b9535dc7759023cd8c65f0f992089b603a7a59ab88ccb9a0361ba2d
+EBUILD wdiff-1.2.2.ebuild 851 BLAKE2B 20168eee855349d4e7a5058b1b8e93ee39bc94231856598a6729db90b41e034c69f1b92ddce2f88d32b57d2da0e1068084ee82352d9924e68a4901901bf6f04b SHA512 2fe11c3f47e3a20ac3b265738182d607cbbbee88629257d288a2a77d97c9249abf5f3523fa19cb2a3799c290854c69f069d7e2efe9e6f99408fb00be3e8d9d57
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index b1cbdec41d11..376f5b78c211 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
index dacb0166e5b5..04b92d04f62d 100644
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
index 023774ecd4b6..5aa5d4ed2f6e 100644
--- a/app-text/webgen/Manifest
+++ b/app-text/webgen/Manifest
@@ -1,5 +1,3 @@
-DIST webgen-1.5.2.gem 200704 BLAKE2B 55749d515223b46c7063596d1424de107f43af022fc54ba431e83ffa4dbe3ab5651e6c61e48f66710a1e958c2f6d09a64ea05c9186dd0c73add5351fbc419806 SHA512 83557bc7a3cafb5e885bd4c50f7083a7576a5c930458075d91ffd58b4fa3c4e406f342dd23988788afb22e9a03ffbff0dfb02d23ebfdef7d2275638c102839b4
 DIST webgen-1.7.0.gem 201728 BLAKE2B ed44657420817d98ffbd72093ff56db22ae3a8da43c77661a663d938f3958c4055df4b7b34252eee162846af27a35320f680fdb6b9b1818f96aa1e51eceffd9f SHA512 1e791f720108996a4f52b151d160d9b6f613c036aae2350c634f5539257c4ae946737ba2df94bc424199413463e3016432a6d1e67e30b419b2770bc83b3b14db
-EBUILD webgen-1.5.2.ebuild 1163 BLAKE2B a44f3a9abccb766d9f4905b912029e82dac08438771ffb73faadd400f7cf474b1a70a4398b45e1ee4b6e8cb1a15673ea1c5e839c291f840bd96dfb593d5e06a5 SHA512 32b64116287d64be074c47f6c74213ada9185d5a3cbca85ce98114180144669531b742bcacf7c1ac2b953260bfc272a8b3838358a41679d1de9420ca3e5530d4
 EBUILD webgen-1.7.0.ebuild 1490 BLAKE2B a7d030cbef9fd77dfeab3cc54d8e7fba04d7a2ee9cc9549c6a45956735ae9c64f7fd2f3ca1bc47f6db8dab0915bb97936582abd7bc2fe0473bbe89de46fbc4dc SHA512 ce7d14ac48592bdf117ab556250c021242994f641920a96e075fdbd889b6a9406756e2c72621598517bd7399c4de1d9c3addae1a7914cbba6ea631f62565dfd1
 MISC metadata.xml 477 BLAKE2B c8293490729904a1a67e6c0861f6fc01b00190322213b566de36e6a56d474118c32a81a9573bb8e43f433d5eba8d5f111878cda00866a5f1b5fb36e052b779d1 SHA512 d872a0fb051b79b34541fafe549c2283a4a92edd7bad4a97adb1c3124e82820a67c286d04a004cdd2fe132a44ea4f0ec8cc3b335f3a1d91aa8877533a1c278bb
diff --git a/app-text/webgen/webgen-1.5.2.ebuild b/app-text/webgen/webgen-1.5.2.ebuild
deleted file mode 100644
index 61d236872c81..000000000000
--- a/app-text/webgen/webgen-1.5.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24"
-
-RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
-RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template-based static website generator"
-HOMEPAGE="https://webgen.gettalong.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="builder highlight markdown"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
-	test? (
-		<dev-ruby/rdoc-6
-		dev-ruby/kramdown
-		dev-ruby/minitest:5
-		dev-ruby/rdiscount
-		>=dev-ruby/sass-3.2:* )"
-
-ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
-	>=dev-ruby/systemu-2.5
-	>=dev-ruby/kramdown-1.3
-	builder? ( >=dev-ruby/builder-2.1.0:* )
-	highlight? ( >=dev-ruby/coderay-1.0 )
-	markdown? ( dev-ruby/maruku )"
-
-all_ruby_prepare() {
-	# Avoid a test fragile for sass version differences
-	sed -i -e '/test_static_call/,/^  end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
-
-	# Avoid tests for unpackaged dependencies
-	rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/man1/webgen.1
-}
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index 5d4a71701df3..caa8bfea140f 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -1,7 +1,5 @@
 AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de245213307b154c8c9f94a4f37b952b7509b7768df53459b1724b91e43bdde3ddb4cacf070d02c4a2dfdf33cbce7cff240c5ec7bc SHA512 70e9b77b5e4eef7a790973737be5c330443ae5eb4f54ac7a706e1404073a3568e0dc42eee1084ae5c4fdecff3384d22ff4666f2b0b24d6d28cf5d66ba3094612
 AUX wgetpaste-remove-dead.patch 1069 BLAKE2B d11664112833cf72b3f0cfd338e6a3e7b41549b60dedb61915501f45f86d72e6003415fd30badb3820453c3b4c81829b34d5bbe501e33aba735b8668487f109d SHA512 edc121802218f7c32664d76e737195b50e167b8b86e62314bc5c818822ee8dca2807d0d38c81167c9771a9a2023ef507f509abed574bc5f1906fbf39ba72ee18
-DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
-EBUILD wgetpaste-2.28-r2.ebuild 758 BLAKE2B edcdfab6edac8f9bea69e5ebafd759165c2306b6dd5651345911d8470da40905fb41899d04757bd777f8f0f2dd86f7f84919a40593b93287614b720a416f93fa SHA512 00c3c1f06aeabf8f9c2e5cb4698954000bf8e563b89539c7bd29160e2605835a68d218e70259b91f1359b4dba0163b6fa312f4e948f2ece4e630c7ce6404138e
-EBUILD wgetpaste-2.29-r1.ebuild 765 BLAKE2B d79f0a29fa9723e71eafb8196ffb596f601c54b4966b9c35867b4ddc9650ffe20f1b1fcc7df65f39253721ee7e5800fbc8e053190c33abeee47c0fcb4b0b6a88 SHA512 d4d65e84ce13e48d056d9e1035dd036643b8c604742774ad2c90be7fe8325c2de89a2e9151976de9007f55856d33b1a293580a814edd36efb6a6f28e9643ebaf
+EBUILD wgetpaste-2.29-r1.ebuild 754 BLAKE2B d0c8d2e00154baa57a3c6bdf0da206c02e4e1e1089f0a1ce8c7b447e25ba3c66dd53e771744285d494bf3a5f2dfd08e800cf8b8ac87c07065d7d16f88734449a SHA512 21c516eb3e5b29a62f25913e564f36903edde91fb214eed1bb7d0ce1858094c39c8a70d4cfb526cd47b6cfb824ac785045a1fdebce481488de7f10443e988107
 MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
deleted file mode 100644
index bd76f271f68e..000000000000
--- a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="Command-line interface to various pastebins"
-HOMEPAGE="http://wgetpaste.zlin.dk/"
-SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+ssl"
-
-DEPEND=""
-RDEPEND="net-misc/wget[ssl?]"
-
-PATCHES=( "${FILESDIR}"/${PN}-remove-dead.patch )
-
-src_prepare() {
-	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
-	default
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/zsh/site-functions
-	doins _wgetpaste
-}
diff --git a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
index 75d49b5d1b35..478db735fcbc 100644
--- a/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+ssl"
 
 DEPEND=""
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 4c3502e5bffa..85e599ec8b6a 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1442 BLAKE2B 2f573c301a560f4b8fdb94d2645bc381028ade8a0ae6358d6ad46d0708da95ac2e9d4922d54303f234e5e07f35615fc7b19125b7e4fd47cc6adf08ecb69250e6 SHA512 ade44120d9d70bc66de84fd4f2c80e8371dce9d61a992871f4e6d03e8cc2264538d878b7c9de5df84cc121eff167f8927d3afadf99852b32e8bd3abdc201bfb4
+EBUILD wv-1.2.9-r2.ebuild 1443 BLAKE2B d5f7311c5a84241305dac26bca3fa255e4abced4187c8fa5fab3380fc0bce1473f11378c166bd32c9fbb008c4e6349ebf18b3570a4f75298479c0263d4f75aea SHA512 724e880ab62219759da678e63c4b59f6cdb391cee8f42a93439d168f7fdb3f6cbd94b58f99b66169bcbedc6722e05393c2880b003621d6e31d55fa3e10a1ae5b
 MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index 2927d8aeef2a..054e347dbd24 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://wvware.sourceforge.net/"
 
 IUSE="tools wmf"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index 611e97c83c06..15b264c9ac2d 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -1,5 +1,5 @@
 AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc6dc8a556e2c2376cd586942778dcb8cbb1aa1a80cf24b1ab94415224b5af122756eeae02a316464eb6323 SHA512 0dfa6f75d9c117869eff3c4c5aadaf6096af8b2239626fc249a3df3ddb5437c417c3265a0a5d956af2241c9d7b3cc137b6c79598c38506fedd2964e85bcf54ea
 AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143
 DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b
-EBUILD wv2-0.4.2-r2.ebuild 819 BLAKE2B b78880bc049dfe21e8abe7f5279117d2f432b3ef8db94a3a125203dfbd6800bbf69f75d7b03ed3213c3504cbb322ddc14d539ea3c90e936195835d8cee970f97 SHA512 96dd54f53f921b73eb0361e5ed3c527fa45fae6c21109f435d8db740d9ea7a0fc4c85fc6b2f3eb8b3258a21b3ca8473d7b783c192169ad6d478625a53cb81a0a
+EBUILD wv2-0.4.2-r2.ebuild 820 BLAKE2B db90a1b22c10d6c657814b7c7feb8754f6905b2a76026388fc10acaaf53b0fc29b41ef1ad3d57847af103ccff9abac29c16e571ff85161e422c6e37458633e0a SHA512 b561f27695a8e0d2f182bade41cdf32418d589b1ee0989c65ae6e25bd9e814983ae13a1e05135513e63bdc34881842aa1643e3ed6b4d8c1096b3145ddc08eade
 MISC metadata.xml 385 BLAKE2B 3528b2f800f83faedd0d61e9842dcd95c97a6fd805beec944ede5967c6f7da198d742521c1d8a5202366518407011ce8cb2b4a6072b9aba2aeb5a5b9642be09d SHA512 700605145c4883ed52e8f5a2dbc230aaabbe12038006c31f784d2bacfa71f8942100ae8342d393a27fa74d19dbc2a6d9cdd829659cf7509182761ecfd4782408
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
index 6f458b88edde..70f4624a6b54 100644
--- a/app-text/wv2/wv2-0.4.2-r2.ebuild
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="zlib"
 
 RDEPEND="
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 8501efb1828c..eabfb3dec4c1 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,21 +1,9 @@
 DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
-DIST xapian-omega-1.4.10.tar.xz 532952 BLAKE2B dec0ebc7b4de24d6f11ea91f090925c0a2dd088ec6468e47e1ea6e60f31acd99d8480f47275df597a508b51c3d2046ce89cd1c8f10e19ff4ad4ce5e593e25852 SHA512 53dde1705eea39fa26afd4db6a0ab39e050ecd1ffc71d2e4c2a2287930d926993c48c36d0c2ad6268188a29876bac1f0e3c29fc54afd2fb6f831899929ebb302
-DIST xapian-omega-1.4.11.tar.xz 533596 BLAKE2B 5002f809a310cfff8b7316c6d1f7fa17f93fd88381aa5ca5de14a443f2b3bfd7f00738bae7b2e3a739a170bd8f454e82f696212fc43282d342946a774b7bfaa0 SHA512 135077e26dc0b0707d1d14c64eeb25db67374b1b7909e9f3e925b10e03b1557263339d2f84c5a82046a159e58a5301834e76e99843d66342666d5694f91ed4f3
-DIST xapian-omega-1.4.12.tar.xz 539324 BLAKE2B 01a9f54dc622699fc4362c3d36a9b529f31c87b6c424f5d55d5dc7e676e8dff895df7e31fa187680afd5eb9e90d65b06d39fc06912b9ae5db8a9e13b694d980d SHA512 2d2c48646f4f06fc4b2666e0901e4f73b2c5da93c4a8e8a5ea6d32e9076a2f18c15c14c7dd2ae2d421a501119ea19b52fe324ad98f9f0bfd6b80f4286721aa2e
-DIST xapian-omega-1.4.13.tar.xz 540216 BLAKE2B a6133e4ac8423f5bbbb67013a8f7a9d936574d8b16dd0adfe42307044e0d0de7773624cd7a7c127bf6cb4bb887ec70a101621ab8077b8918c5b3c83b84b36f66 SHA512 438b015aa554d9a315b1e2a5a2d7a77e0fbf80455f81fc2abc47e7f70d3cb64e4b7811566df2f790cc39b75293de42e2e685dc9df0ac6744763b11216f265785
 DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b1390ba63ca999f235a10a7ab9bf4db378273cf6f7f6b3107c80c1ebb44bdb1a94ce3c00585f83ac0bec188163633be843b SHA512 27059d13bbdfc2ee9e8f4f6e74479bac0885cabab97d7eb1ebdc57eacbff1724b2684ba72efdf6d35f608e2e8f0891d47c626aaa100c713f4c2f66f923d841b7
-DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
+DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
-DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
-DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f833384ba7ca53aa7e8affef77d71bc74602476ef7c6a8b11b67a60e0ff2e007e0d4da38020ddcac9d7ac7f2df4774d9 SHA512 3e784691c7de807a2eb9c00c97e03cfb7e66686d54e0ee572facad7bcfbdcc2c7aba4b60996bc56657a5ecabc79984e838b9d207cf6f1b7df1df90c108d17d1d
-EBUILD xapian-omega-1.2.25.ebuild 1264 BLAKE2B adf8f14a56a0c6e6330c7ce75cb635a5c4c86ac3131164544c28e04c3739aa782f1aa1544c6dee066978c4066f5e01054a685cb52f4a033bebc79b1ef9b5911b SHA512 e69c60ac074f4d841f72d51c51d6b68175b7c22f40d7eb8ae230ebd76afde1ea9f613861d14499af67d01b0566791cba81aaa56dfdb0ceff0a5bb5e0d3a1ac57
-EBUILD xapian-omega-1.4.10.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.11.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.12.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.13.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.14.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.5.ebuild 1149 BLAKE2B 784ae6372400300e3539ecf4f498411d73dceecef6956d97c7cd85b97d41ba3da48d12c5c80602bc504818b0071eca87eef3e92590dba95c0003fea29d02a2d1 SHA512 3f28982cc2bc1963358af9ddf7364880c76dadcf823077c9cbe33d12c4ee08f943623bef12dcc31c757ee31ea7c618936fe614f804c5db0b77ed90af52810384
-EBUILD xapian-omega-1.4.7.ebuild 1150 BLAKE2B 07e0bbefda42b968c1859caf0a6c50cf88b52196b3d875df89280fed4265d802b49c70eec8b5323826bebc1bd935a5aae52da4f9730999778ce5404ea9e32905 SHA512 9385db59006fae5b9227f309e2c6ebf2808f538fa8b0038fce8898dc2e09d585630cb8d6f3a84f87b5f9e99dd6ea80468cf97b1cc4c81ac1598e2a0cd4edf965
-EBUILD xapian-omega-1.4.8.ebuild 1155 BLAKE2B cca347976e779773c5738ed285a995169b39bedafd629a30939fc83bfef16d2bf38f5f885de92524c2ba41e0865a74c78d23083b6ae6d69f63ede687aeae71e1 SHA512 412e291cc0d2f73f384a29c3d92965c89c3dedc8aa911326de78e0a93611b1377dad8355ccf003509701cacfbc8953ba58ec9ff4dac72a29bd854e8d5cf88b38
-EBUILD xapian-omega-1.4.9.ebuild 1155 BLAKE2B cca347976e779773c5738ed285a995169b39bedafd629a30939fc83bfef16d2bf38f5f885de92524c2ba41e0865a74c78d23083b6ae6d69f63ede687aeae71e1 SHA512 412e291cc0d2f73f384a29c3d92965c89c3dedc8aa911326de78e0a93611b1377dad8355ccf003509701cacfbc8953ba58ec9ff4dac72a29bd854e8d5cf88b38
+EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B e6431300b0eeea58f502e8475225830986573e839441f1701cf9387c1ad53bf2bc838d08aa823c65f93d62c94501def769602b4772d714cf2d9396a052c61c50 SHA512 a22cbd4bf3a7ea46c0a60b7a1884af858f09464928f90d63e0526385e5fc6cad123446d59affe1efbad286c883c1bc125b5f6f7fb6a8b224f9b242ddcfd13a98
+EBUILD xapian-omega-1.4.14.ebuild 1149 BLAKE2B ddc83d4bd6cf3187c7a96015a965ab863f90dc571f86272f41de533cfefa5b610c5bdb10ae4ce7f016c082b3e18dde524d98987d2128fb747d7fc3ac55e69aa1 SHA512 1ed41349f27ed28fca234ba45ed25217a8bda981aef419f1bb77c0e2dfc3c509b92a46c53de62d3d439e455ae2202d34a65508964f966e32640266070d72bc3d
+EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
+EBUILD xapian-omega-1.4.7.ebuild 1151 BLAKE2B 3874b57a4f11bcf73f02c23c4d7180ed8f376041c362a77fccdf6f1a586e64ad8dcef770422454f2e1457ab46c7180d1dc4e61adf58b8d87d328663efb5ffb1d SHA512 157aade1bfea26bac5c53caabb1b72ebf85464e4f9cbd07f0fdf1693e2bb7e6d44526af6acb34ea7b9a88cf605a9a67fe81049a184d300fdd3cba07605c9f032
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
index dbca81512708..aee8e82c2156 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/1.2.22
diff --git a/app-text/xapian-omega/xapian-omega-1.4.11.ebuild b/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
deleted file mode 100644
index f76f70d1acab..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.11.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.12.ebuild b/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
deleted file mode 100644
index f76f70d1acab..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.12.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.13.ebuild b/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
deleted file mode 100644
index f76f70d1acab..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild b/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
index f76f70d1acab..10ef4e156d4d 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xapian-omega/xapian-omega-1.4.10.ebuild b/app-text/xapian-omega/xapian-omega-1.4.15.ebuild
index f76f70d1acab..f76f70d1acab 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.10.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.15.ebuild
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
deleted file mode 100644
index 92413d87bc98..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
index af99b4ba7ec4..1829fc6f9d38 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xapian-omega/xapian-omega-1.4.8.ebuild b/app-text/xapian-omega/xapian-omega-1.4.8.ebuild
deleted file mode 100644
index e045628ddf17..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.9.ebuild b/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
deleted file mode 100644
index e045628ddf17..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 8c076be99414..af0af22db187 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,6 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r1.ebuild 2774 BLAKE2B be12fc571351be2e59061af97df50e1fe05612005fea1220dd7c6179e6e791bc4f4a6edf0ae946d7da484cef384421efffce5c17e6a0e20dc4232df45deb5d51 SHA512 19852b9d1be630dc70437751d345f3bf9c7f1740807e1a32702e06125c21a52fa4f3abc2fa23912618e16c246a6ddd2f715bbf728070ac81dda9fb6d31c4f2dd
-EBUILD xdvik-22.87.03-r2.ebuild 2914 BLAKE2B d3b3b254214fa79a2a1e65aafa22e756d1b1155afe676a97ffb698f03938fac8fb0c5dbb96fa3918d1725bdba3575e5c84d886e51aadb7ca43c5a424bf3c55b1 SHA512 a535c091e8baff1dbac9eb47f81f2c7b29a0934073cd9858285a5d884759c664ca328f9e932547b6a8a4afa3058af90ad3d500eafdd00e11da3d7f1de5552b9f
+EBUILD xdvik-22.87.03-r1.ebuild 2771 BLAKE2B 90c06a6764d4c30792c7587c1a00aa8ad27bd6a31afc63b4baa261b588053575add7536ac29695f133d42a40b914652a3a6485ea410d2d61ac0309194a02ca96 SHA512 3504f7b69e668432635b6905fffe080f936f021125dc2caf1731416d2a0c8042745c71a30df5a170d273faa0ebaefdee3ba2ac2065987c5da9da407f5aa4e8e0
+EBUILD xdvik-22.87.03-r2.ebuild 2910 BLAKE2B 404e3443cde4e2f6586957c6b7f7b76183c79e0cd2c0e8f2f0de8e77c0893df5aa2412d84278f479dbbd94e7e47b9364e4c232ee5afd090c3e679eb875b0c36b SHA512 cb0f856a3336eacf54eda2de265593fbda525ef141a8f7c8bd408624a4a814df7cdb479548ec61887ab014bd0ea68f11531dd04a129e632423e93d944b1245db
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
index 8213ab397534..cfe5d3eb3bbc 100644
--- a/app-text/xdvik/xdvik-22.87.03-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
index 5ec22d077c6e..49accc94ae42 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
index bf89b6f72cbf..5555237f13db 100644
--- a/app-text/xindy/Manifest
+++ b/app-text/xindy/Manifest
@@ -3,5 +3,5 @@ AUX xindy-2.4-locale.patch 679 BLAKE2B b67f436e0aa67b8474336bfa1f70f6da52199871b
 AUX xindy-2.4-nogrep.patch 431 BLAKE2B 97543e7eeff2cb4c23c8b9cc0d5673fca2c3f682553a8a3d25bc39253a371320a2a423fef63294be32f5c36b5bac30717766b3a9a4c75663535ce0a6bd8e13bc SHA512 fdcc109b89a6e56c86624f348ebe1c98f574b9f788e3f307e3b110fc2b93643af087e16711b3f0bc6604dbdcfae06080693e4976d8ebec5816e68fb73f89fa6c
 AUX xindy-2.4-perl5.26.patch 337 BLAKE2B c869adcd80cc93bbfe46a385effab94a920f3fb76441c653ea269962071ad5f9269961caebd13d6fce38f3f4dea485291b510db6e884aefc5edbd22cf4b9bd4a SHA512 3f3abc9654e3c7c9de12a542241e107d80046bc26d0eed336e046835a221ea190d526b37c85f91b722e6cac89f140e38b0cebaf208a2391d8d7a42a2ca4b8459
 DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4
-EBUILD xindy-2.4-r1.ebuild 999 BLAKE2B ca759bbe1a86defd9a171be102b419ea4bf2972ef391b7c6874c253aaf85cfb72cfebb306f8696a6958218d12127e68a6fd29d38025c3190e9b3c0c07f0d8020 SHA512 747b8916d5a95e85d2b9ddbf266397a0e2e45b537223c13e67db2b7a8dcba7fdbc56699b1d5207b4130812a9c6397428090abda1e520dc450d3c1909d5fdab0d
+EBUILD xindy-2.4-r1.ebuild 1000 BLAKE2B 0fe9f394b499132a697c65bb24440a618dce02da9c6d71cfe40dc4f72af21300c08c29391002b8325cfa7ad4bb84c9fc236d3b5459c71d01fdf204808ca8f7d8 SHA512 89cea602ebcd5c1bcd5e793b318b6e19894e3f7d8ad9c3072362ee80c910de004c18f0edc6407185be7e6a6d5e60e306627c7692f2db4f1a1982c9ffd79d6a53
 MISC metadata.xml 1118 BLAKE2B 1bb41c8208737b0ad0d3545143cedd0b70aa2cdf632905f1572ca2c2aaa2eb35e712eb5971b4e4bd8a66a3130ebc1f21c8d6ad194056fe5a1c15c522e1d57219 SHA512 ef09dceddfc91214cf575c58f9ffa8f82ec10bfa7274caec809a00c83b9a07668139eca7e420e04c5fe38bbca9084bfcb6fafd10bc91092138726dfa1dc4cced
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
index 02614411ff8d..a9f5d4c7ff04 100644
--- a/app-text/xindy/xindy-2.4-r1.ebuild
+++ b/app-text/xindy/xindy-2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.xindy.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc x86"
 IUSE="doc"
 
 RDEPEND="virtual/latex-base
diff --git a/app-text/xml2doc/Manifest b/app-text/xml2doc/Manifest
index 589f68d9542c..d7ab0ea72abe 100644
--- a/app-text/xml2doc/Manifest
+++ b/app-text/xml2doc/Manifest
@@ -2,5 +2,5 @@ AUX xml2doc-20030510-gcc10-no-common.patch 195 BLAKE2B 3c90b98f57ae23f78b586dadf
 AUX xml2doc-20030510-makefile.patch 2661 BLAKE2B d9822ba57187553ae6da3f2b3f146bd3ae4316a99cb9608d88112a18462345c4614e167bb3757a723b6a12e2b521f1a2fb575ef19db480ed45fa60e133297c38 SHA512 c5aee7f9b98f1c64345459cb3ad6132082c04020a56f39fa950584689953c1058564332351a5b51e130e077fbe15c08ea88f35504888a153bfc878d8210b8b00
 AUX xml2doc-pointer_fix.patch 627 BLAKE2B 3ca9313b44d88fce3f548874d40ed57b42b9faa66e30574677c911f7d5c9d0a8d5eea8c35781162302543df82c5b38b1327fcaabee0a50c396c95937c3a86e44 SHA512 ebdf69986821fdb1a22e3da4447729433d7f30d08e516b5b28c1f9e4fe6ec98d7a31e925028f940e8a0aaab5c05bd52a1a4d12564fd47a79953b1de606fd2430
 DIST xml2doc-20030510.tgz 53307 BLAKE2B 3f7e44ede6ac0a2ec4762e66181de34ffe553035b54ee302345d1b38a5063106fc4ba65abec042b4ec693b173d70fc4b548ebc942b2a8f6636f84e7beeed2bd6 SHA512 9eb2970b7adef1669b9b0aede2b3d2b42ba234c8294f0f8e6e230d8fcc6cf878675b2f0bff87ee36a255ab29376be844d92d382be7aad0ab11972847cfe49dbd
-EBUILD xml2doc-20030510-r1.ebuild 1011 BLAKE2B 4b5214bfa4a90b1847687f819f3ebf684894e708ddc68db4c28c87da3985afff69712a20ee3a868180ddf6b665c32e07d46ed39f29a512fcdbe20f93f974db2c SHA512 92ffcb74053d0f87669ae2d5c6d10e5dffcba368478e2358f36fa6e8edbd71cfa67e269af963c33aec1df9d22534470dfc82ccacc1dea2898a6bba31b76c0717
+EBUILD xml2doc-20030510-r1.ebuild 1012 BLAKE2B 543ba177f5285871fe35bda2f8c548028b7d08ec1193fe37aa09c650848da76e03ef729f3fe1c86243670cd13c7ed7414a91f6ddd2adc74b82e3659919332f91 SHA512 27ffa164b74cfad3626604513c4d6656cb5af0e0434bb92e582531e6ef1fe451753db3c8b7209ca38663faa5b5bc346ae093badd8d6b8859947777d7ce37c28f
 MISC metadata.xml 244 BLAKE2B 6c0f152456a096c4bfbf861d8d7db04d0b8c605deb5f9a3277cd6b60df4a714c77bb12d5e4a491a193da11883447855986468ecf5c707600febbed973253181d SHA512 b4abe1dd13476a480e518e284cb832c2b41893049169975ee44edba8661af79b7cd8f8110e03b920fe90cd8e0e1d926bd5a692a24ecb841bd454659de3422ee9
diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
index 6dd7a88b09f0..919ecba3c27c 100644
--- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 DEPEND="dev-libs/libxml2:2"
 RDEPEND="${DEPEND}"
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 8a8d9528b68f..916e958d7117 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,3 +1,5 @@
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
-EBUILD xmldiff-1.1.1.ebuild 620 BLAKE2B 8ec38e76c15cd7a6059125c0b260ba3aaeba79c613df76709f0bf5c86d9398185ab14f2a9fc135d9e2f0d1f2ce8bef0756c1e2788107a957bdb1a9ff9f70e3cc SHA512 11fa1d7e36b3256e4d4e1cca6bc43d0652bd5102715e75120cec8b10d2169644a72c16300a5a8e0d48e459c1b8294fc3ef41c7ee65a7c52012058c46cec6cc0f
-MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
+DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade00a14b817d42706bb1b3e407f2645d7df5b5e9f4d60d75d48afe6475e5c1f1bab24ea6fdd78d8646c79b58 SHA512 1dc3f76f51df3c506af827c9a7f67386143b4ce49c2159302e07c5f56054ffd9e858f086bb76d64a038b7e9ae7c116d1146714d4528ea9d53e23e1bacb4bb812
+EBUILD xmldiff-1.1.1.ebuild 621 BLAKE2B 7e0be4595a818a7ffa00105ab7bec4554795ab8369ec27fd27520de6c2aa640104804c51cc52a598fa03d919b1a7e9f36d39895011292d0dc47b95ca140cf106 SHA512 1233cd14bd38ecbb28619cf381306f2f40faecfca36a2d9c7cb59453b406f70815bf9b27c3f18f7a2ac5e8c795427ed8004929056f57876c207a6c2f3490c011
+EBUILD xmldiff-2.3.ebuild 638 BLAKE2B b84146a17d0461f6bb5ac912b8a9e1751c4b0a5cc6591c0f98b582cb273036002bc6910af01549844b96a6f5e90728e000e181e021439dc35987387124e499fb SHA512 49620dc0c1a1e5f0c34b5b42f540e388a4003ce7a7c04324ad8bf2cf4538e031e8a897408981328183af3fafbf547e31fe4492103bc889ff9e42a9205d806242
+MISC metadata.xml 776 BLAKE2B a2813ad30729db3a2e48ef6fefc7603df138326e05231b955475ec61cd44a175f4ba83c7fa7ce4c2da208676b0f72f1b08e371670af1ba368c9223e947eda4f7 SHA512 579b4593545777f8c244e8b3f0532bd968a420409b946dac93ff875358b814064e8d24548f2d2417602e2840f6e3844dc2c6ccbd07804f948f22e5467ff5254a
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
index 14c1b6f3de84..70f8606c9a10 100644
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/metadata.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>andreacerisara@gmail.com</email>
+		<name>Andrea Cerisara</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		A python tool that figures out the differences between two
 		similar XML files, in the same way the diff utility does.
-		Xmldiff was initially developed for the Narval project and could also be
-		used as a library or as a command line tool. It can work either with XML
-		files or DOM trees.
+		Xmldiff was initially developed for the Narval project and can
+		be used as a library or as a command line tool. It can work either
+		with XML files or DOM trees.
 	</longdescription>
 	<upstream>
 		<remote-id type="github">Shoobx/xmldiff</remote-id>
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
index 08e9a9a605ff..8f2480fc7ffb 100644
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ b/app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/future
diff --git a/app-text/xmldiff/xmldiff-2.3.ebuild b/app-text/xmldiff/xmldiff-2.3.ebuild
new file mode 100644
index 000000000000..2b4aa9c67344
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="A tool that figures out the differences between two similar XML files"
+HOMEPAGE="https://github.com/Shoobx/xmldiff"
+SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+DOCS=( CHANGES.rst README.rst )
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 1de420434259..1332622364d9 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,3 +1,3 @@
 DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
-EBUILD xmlstarlet-1.6.1.ebuild 944 BLAKE2B 43de29f725e2cff8b62be3b68aaa43e8473bf5e3f50e2017c823b5fea45e44b41ef8a1fbce8e8bb5c48cf0927bb24d6903f2d4ac566f71c1349fbed3603abcbd SHA512 68e906d0da8fbd93ce2423e5794545ba2a18929ab991e90588384d465719ba2ff29605c271e55d93b47a31834741d4d1a5c501bd62df9f037e42bb4a77de3a49
+EBUILD xmlstarlet-1.6.1.ebuild 940 BLAKE2B fb6b9231426bd38188a6fd3c7e18ad6b1d7af6dd4af2964ec278d81717f99c9f8366e21a6d505edf9ddd398fdb578d20c817c7f4cb6572612c7580781c1f0035 SHA512 891edcde0d98e75bd4eef3fbe640d40f68e772579a1d07c1241d39ab599f6704ea8987e1e02689d0fae8d709b3cb31d7f56991fb708a2ae619457ec0205688b3
 MISC metadata.xml 293 BLAKE2B 1e39cff7005653b64f2f27c49262c0ae492da15d33d361e5e9b4148a3e975db2b30e26468fe5cf7f61155f53a3f76a16121b8a4c85ae5420d0ec74885d33bba9 SHA512 9fd9f809f74a272cc9abb789f3e08ab9b2ecdd1f6ca3931f43567b3b2e3423c0622bd3cc52f5dceac6989282351400fe9c1554ec2b69439986902b11f589796d
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
index 48e432677af1..c2ad4628c946 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 87269a177c42..42e64dea15cc 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,4 +1,4 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r1.ebuild 1514 BLAKE2B 2ec8b00e8e33dd31e89606e0c25720fb0b884b5c40cdf4583d196b4e6bb3cf53fcffaae8916c136e945dd45d2c00c45f194d8aa3ab515ff34efcd6793aebf42a SHA512 f04dc81a910824593a4a47846e390063f9c7e66b8ecbb2e082b33b7f0d119516958e6ee04eadf6e024c845da66200e13d0e4382b051fedc0780c7c04ad10edc6
+EBUILD xmlto-0.0.28-r1.ebuild 1512 BLAKE2B 663aa9555c2acf8cf061ad2028da3ca65055454b35a6ba1eb0220eeff48d29a0021a87dc6e9f593f69fe200dec30ce7e5188b339092ac38367efbeb6005e8623 SHA512 bb26b3698a67b28b1469727eeef6b8c5cd74b88535b92f98da36266983c525ec17d4fe61b8629ea42485a0dbcef06113a874e6e34cba0ecc132cda72ec11a446
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index a1209c4c9d5f..adb8dc5a4142 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 82961b71cc7c..b9852a8441c4 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,3 +1,4 @@
+AUX xpdf-CVE-2019-17064.patch 760 BLAKE2B 59e9c01ecc107345cd3bf360cfd04611f997bbc18eb9cc1cddb6b5ca95aceddc0b013b074367b153ee5cfc4b562839bcb90ff9d93262cb558f5515bae6f71746 SHA512 328dcfa5f01f9621f8da6995f2ae63a6184bef38a1bfb73fb89c330fced2b52602cfb45b0e8f72f09bac8050f8abc94ba5bbd76c13b39189a086485888c4deda
 AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21fccf60d5f2db959a7a2e2e64eb36cc7cbc0aea7e1cd21bdc6a11cb0ae7ae43e9293164ba5ef88685aa1653 SHA512 8bdeafe1553fea67b6d30afd1eb6e6abbd57f470a79b982b2b545fc91f12bc00c34a1639a05e8ef589ce1518886cc8de45c54303c4528c7e3d721ff624a0d27e
 AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c
 AUX xpdf-visibility.patch 414 BLAKE2B 835bdfdbb39297859d1886a5ebd76bec23a8b8df744f627a475d8c00ae3cdcfe219ec039f00b7b6a7305e6c451399c422fafdea0599bf22d2ef34bd4912eae4c SHA512 a1f87523aeb657484181005b3e40a90eaaee2d00452bfc50bc23913d6e1e5a9117600959b3800e789be50f6d12d726f875caf02b73ec41dc9d98e1215b2e964e
@@ -14,6 +15,6 @@ DIST xpdf-korean.tar.gz 526847 BLAKE2B e1640f6df0bc1e126b2e0f010403fc3ff068a8171
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.02-r1.ebuild 3489 BLAKE2B 3e817d477b70bb75600203641464a8c8b966feaac3346abbada46a1f23808517528e09b4cd954bbe9e088711f13911c39fc2d69f1667a0bdbfdf6eafd6759077 SHA512 2693535810d8744f7be68af66655f6bcd54a40641fb359993281cafbfb7738b0ec47fe937af7c9ec8cf59f8a2db3a91d38fcd4047caf91c16a438393dbd70b9e
-EBUILD xpdf-4.02.ebuild 2983 BLAKE2B 7005023c4f179f8306d0af2e6bbe1841eacd72a9075c070b945d2bea1a25c09586a61d05625f85d418a3172c92345d811390c2febcf6ad1df931b0a98c831919 SHA512 bd7ebba70d9bba16b88caa9b5feac37dc12f0ec82048e7ca94ae63066a45f7fce3bb83b773624d0c1bcfe95ef00fb9977edf22cf89c7ec97dadc5e9b33815f19
+EBUILD xpdf-4.02-r2.ebuild 3529 BLAKE2B e62d10500bfcc6628a57604fa0cf2b7a66cde0fdf58b834fdca6adfed338002d5b952982cfeca612a3b6736c936c305df4d9db1d160bc5d2b983b25cff783bd0 SHA512 c105a43366383599563e041f4ba31021f8f2931ebe101211e0ecbd766263f7c19fe95d2d317b50fa5e3ef3c35ffe39e711557fd2d9c80359e5e1604bc9891198
+EBUILD xpdf-4.02-r3.ebuild 3727 BLAKE2B 0e7df0801131196087a64a19e76790b5296ef8cb1fd17391ff4998ede1a612415791a1377ffc0b6281ecfd3bb301c4d38348822eb37033ec19e16b4757741265 SHA512 04282a62462a1049361233a6dc260909f1a7a302476ef7afc15c99169daafa96f23eeba8d7ce8212659b2be9ddb50daaa03772134f004d4e3ffe4db4c81b337d
 MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568
diff --git a/app-text/xpdf/files/xpdf-CVE-2019-17064.patch b/app-text/xpdf/files/xpdf-CVE-2019-17064.patch
new file mode 100644
index 000000000000..c4f84a4604c0
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-CVE-2019-17064.patch
@@ -0,0 +1,24 @@
+Fix CVE-2019-17064
+
+Fix NULL pointer dereference by initializing field before use.
+https://forum.xpdfreader.com/viewtopic.php?f=3&t=41890#p42672
+
+diff '--color=auto' -Naurd xpdf-4.02.orig/xpdf/Catalog.cc xpdf-4.02/xpdf/Catalog.cc
+--- xpdf-4.02.orig/xpdf/Catalog.cc	2019-09-25 22:54:33.000000000 +0300
++++ xpdf-4.02/xpdf/Catalog.cc	2020-03-01 12:05:43.235486706 +0300
+@@ -159,6 +159,7 @@
+   baseURI = NULL;
+   form = NULL;
+   embeddedFiles = NULL;
++  pageLabels = NULL;
+ #if MULTITHREADED
+   gInitMutex(&pageMutex);
+ #endif
+@@ -241,7 +242,6 @@
+   // get the ViewerPreferences object
+   catDict.dictLookupNF("ViewerPreferences", &viewerPrefs);
+ 
+-  pageLabels = NULL;
+   if (catDict.dictLookup("PageLabels", &obj)->isDict()) {
+     readPageLabelTree(&obj);
+   }
diff --git a/app-text/xpdf/xpdf-4.02-r1.ebuild b/app-text/xpdf/xpdf-4.02-r2.ebuild
index e64446609706..c942b87ba90b 100644
--- a/app-text/xpdf/xpdf-4.02-r1.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups i18n icons +libpaper metric opi png +textselect utils"
 
 BDEPEND="
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-automagic.patch
 	"${FILESDIR}"/${PN}-visibility.patch
 	"${FILESDIR}"/${PN}-shared-libs.patch
+	"${FILESDIR}"/${PN}-CVE-2019-17064.patch
 )
 
 src_prepare() {
diff --git a/app-text/xpdf/xpdf-4.02.ebuild b/app-text/xpdf/xpdf-4.02-r3.ebuild
index 4263e9c9ad4e..aa94d174acd6 100644
--- a/app-text/xpdf/xpdf-4.02.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake-utils desktop xdg
 
 DESCRIPTION="The PDF viewer and tools"
 HOMEPAGE="https://www.xpdfreader.com"
@@ -24,14 +24,18 @@ SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 
 LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups i18n +libpaper metric opi png +textselect utils"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
 
+BDEPEND="
+	icons? ( media-gfx/inkscape )
+"
 DEPEND="
 	cups? (
 		dev-qt/qtprintsupport:5
 		net-print/cups
 	)
+	fontconfig? ( media-libs/fontconfig )
 	libpaper? ( app-text/libpaper )
 	utils? ( png? ( media-libs/libpng:0 ) )
 	dev-qt/qtnetwork:5
@@ -40,6 +44,7 @@ DEPEND="
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
 	media-fonts/urw-fonts
 "
 
@@ -47,6 +52,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-automagic.patch
 	"${FILESDIR}"/${PN}-visibility.patch
 	"${FILESDIR}"/${PN}-shared-libs.patch
+	"${FILESDIR}"/${PN}-CVE-2019-17064.patch
 )
 
 src_prepare() {
@@ -65,6 +71,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DA4_PAPER=$(usex metric)
+		-DNO_FONTCONFIG=$(usex fontconfig off on)
 		-DNO_TEXT_SELECT=$(usex textselect off on)
 		-DOPI_SUPPORT=$(usex opi)
 		-DSPLASH_CMYK=$(usex cmyk)
@@ -76,9 +83,36 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+
+	if use icons; then
+		local inkarg="-e"
+		has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
+
+		sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
+		cd xpdf-qt
+		mkdir $sizes
+		local i
+		for i in $sizes; do
+			inkscape xpdf-icon.svg -w $i -h $i $inkarg $i/xpdf.png
+		done
+	fi
+}
+
 src_install() {
 	cmake-utils_src_install
 
+	domenu "${FILESDIR}/xpdf.desktop"
+	newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
+	if use icons; then
+		local i
+		for i in $sizes; do
+			doicon -s $i xpdf-qt/$i/xpdf.png
+		done
+		unset sizes
+	fi
+
 	insinto /etc
 	newins doc/sample-xpdfrc xpdfrc
 
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 3520f40898bc..3ac0d7be5df2 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
 DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
-EBUILD yelp-tools-3.32.2.ebuild 632 BLAKE2B b48998fcb5ae9bcb767e99861f133de88f39f24c28f4e9b6fa2090c4f96814675481acd7110824f6334922ba7ea511ca6b4ad4fc7d4e9730900cc5db54391af2 SHA512 3dbc9c96cac8067f38ec853a256064c11e6f2c1e1e83654616e704ba4fc965893ad0b7b1f06ff770138831ec4ac82141ac3581a46823975a15703478d5ceaf31
+EBUILD yelp-tools-3.32.2.ebuild 629 BLAKE2B a31a7aa094c1c42d974e63d7576ceeb1ee149abb22f9a161d3407a20bf00e9753523fd89e0d5aae697583907d010ed751bb0b544fa3ffe6ee0486548a2d68a1d SHA512 07ecb3457fd3e313bad9b4c8d6ebc19ceebd9ff8c39c35d962b9ba4bc97cf811224d6891db4d28ed652d21536ee5dda7df5ec7c108ca4a904c5efca304fa2a27
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
index c382ed87f3c2..b751bf07c120 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-text
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)