42 files changed, 140 insertions, 640 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 5092b57504a1..7d6ed9374e26 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 5de60b308cd5..e49c15742852 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,5 @@
 DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624
+DIST asciidoc-9.0.4.tar.gz 1111102 BLAKE2B 3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f SHA512 9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b
 EBUILD asciidoc-9.0.2.ebuild 2350 BLAKE2B 00b0c901aa6e0afc605d9aab86fb92c61257031b6f5307e412bd33e006b5475d9d8b3ebe8975c5199cd5074fb40200fb80e1642d56bfa3991f3f0793fe8c82c6 SHA512 64d685ce15c063c58426fec009941c7ba90efb6367bd9b109e1f53e5c53df152fcc169c9e5e15a2b8963cbf6d351ef5ab3112c88b5cf5ca4c6689e20fcf82315
+EBUILD asciidoc-9.0.4.ebuild 2359 BLAKE2B 73483e2f453863fb082197713c8332572defb7c97ec1d1b4bfdc34c6da70f374cbf6b613d8245e803fd831c95636dbd7b1181eac0bb7c9e27560d3be2c926553 SHA512 d8187de4533f6fc9357d1fc7de72ee948956d02c0473f0273b172a833e86973f6f7160956886a291b5214795de29d13c4125e222f34052a07677edcc1cfef123
 MISC metadata.xml 435 BLAKE2B c6a62f25ed62fc8bb28f94a51985d44a2b048eed430d1e92670bf257039c15ccf741414f9c64f3a60220217fd8c2e995910c611890664f0118541996d7b9c9d3 SHA512 b18f244fd4bce0103b7a3c6a5d1e063d45fd1f17458d9a8c4cb2b6543bb38d7bb7047105be81b39d309ff0c3d9343e36df44345f31e32c348fc8aff30ef6d837
diff --git a/app-text/asciidoc/asciidoc-9.0.4.ebuild b/app-text/asciidoc/asciidoc-9.0.4.ebuild
new file mode 100644
index 000000000000..bc94bbefaca5
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-9.0.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit autotools optfeature python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2:2
+	"
+DEPEND="
+	test? (
+		${PYTHON_DEPS}
+		app-text/dvipng
+		app-text/dvisvgm
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
+	)"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
+	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
+	   filters/code/code-filter-readme.txt )
+
+S="${WORKDIR}/${PN}-py3-${PV/_/}"
+
+src_prepare() {
+	default
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		asciidoc.py || die
+
+	# enforce usage of the configured version of Python
+	sed -i -e "s:python3:${EPYTHON}:" Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_install() {
+	default
+
+	if use doc; then
+		emake DESTDIR="${D}" docs
+	fi
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
+	optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
+	optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
+	optfeature "\"graphviz\" filter support" media-gfx/graphviz
+}
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index dd88869312db..81966e6ce03b 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,5 +1,3 @@
-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 678 BLAKE2B 357443c76f206854737eec7b9d32561515339e316428cc2c45d4bf9e222d36deebcf8191774961089c120eb074c8c357259d527d8e32183bf04dff7851e42226 SHA512 54f8ee43215a9e2de7eef0a5d4732d07fe26ef6f68c22732dd616f012e781f44115b01e80516cf5e585140fa91be4103e4d41b603b510b74ed6eda37f05b3460
 EBUILD bdf2psf-1.155.ebuild 678 BLAKE2B 8004a9359bef3f975bb70aceb4e1bcdf417b3b5e475606f4cc7846b724bce95e96b0d7d56932cddc04fc09439a41573837e1008dec38946b0f88750189203cab SHA512 2b65c85a5682775b3b5e89528ff961a805bb6e09a5f0cf70760cd69201bbc4737c5d0f7323acddbf3cc264ee104d2c9ab14357c524305781db0a71058b963e77
 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
deleted file mode 100644
index 0afc4dcd9ef7..000000000000
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converter to generate console fonts from BDF source fonts"
-HOMEPAGE="http://packages.debian.org/sid/bdf2psf"
-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 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-S="${WORKDIR}/console-setup-${PV}"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin Fonts/bdf2psf
-
-	insinto usr/share/bdf2psf
-	doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets
-
-	doman man/bdf2psf.1
-	dodoc debian/README.fontsets
-}
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index faf8cd79e36b..342ce1fb4836 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -2,6 +2,6 @@ AUX convmv-2.05-manpage_nocompress.patch 495 BLAKE2B e1f3b981d99cbd44aca2cac0d18
 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 696 BLAKE2B 4b4bcd977727970df9ad3f760e7612b4fb39f55ea60bfd30a973a21f65864ab2470ae7222ad015aaf8ac66b57b8520285e7b87d8b37be22309c7c822bc81dbba SHA512 f69f37a90cce7e27142523d2124d2708706387a0c034435972ecc4af2e8d1f80615c9b0855adb6907234a719205b61b7354fde5394cdd47438c71c7dd242ca74
-EBUILD convmv-2.05-r1.ebuild 801 BLAKE2B 3b6d6da040354faac8599cf483751f1d009fb8a00ec6f9b307b872f9327a768c9cc8040ddf011a4ca5704be991a368a9e44061693142b3da8841d1bf65c140f6 SHA512 0e828ac5896b76a7404ee3cfd16c057f1e2d03b1f68968100a4baf2bf0cd701765ff1217b90eb489d5e11fb10b2c9a7c2c47746c18292e2994a643da8a97b100
+EBUILD convmv-2.05-r1.ebuild 808 BLAKE2B f047ed37c8b98470f34b2960e0e0a9dd1fe45ef59920e5a4648ad41d49d947ce1be2eaec77fec003f9bdf12ceffd2c1894eb80effdd79b1fca908ce2ff4fbd85 SHA512 1f52846d6ff72002b7442c356f610ecf7c66f60620fe26e0f2627b81889a42423ce1c70c338f77ae556c32d4e563ad311dffd8bfb60b987c69f81029e5fa44d5
 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.05-r1.ebuild b/app-text/convmv/convmv-2.05-r1.ebuild
index 3384fadada92..12ab21e7e29b 100644
--- a/app-text/convmv/convmv-2.05-r1.ebuild
+++ b/app-text/convmv/convmv-2.05-r1.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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 9a0428df7701..bb5940c525c1 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 1258 BLAKE2B cb0329c1fa96eb8ea1c66a58fb6c0941abaf76a8f724ad86ad5813f98fa616591e4398ac36820fa8f83d8b11c13a161ae4289d7a5d192745edd78312208b7437 SHA512 cb07774f9cf78f5b3d81770b8bf26cbcdbe08d170d12700c2d28f7022d150bcd0d2a88d4cdc4089eb981a68fcfb4e4bad54763aa248e700a4e74ca9cb21cf52b
-EBUILD epspdf-0.6.3-r1.ebuild 1361 BLAKE2B 0235b16bf07b93688d2d70a3bce5b2a77bfc69d2d265bee434b62c1ab18bf0be596b8e0f1d8bbe5f8c56e4eb8b8e912ad88d994781a76acd912d47d6b1bb486c SHA512 4e3fe579440ca50b638473d760952997279c664494964a110cad006ad2234f58b8a4fa11bfd96b7ee50a9b2e6ae7622abe8348773a07dd5b7b5c6daec3625561
+EBUILD epspdf-0.6.3-r1.ebuild 1358 BLAKE2B d6594258630b816ee6959987d4d067a5a98080ee23a14e8a35f7ba43b39b5a2a8ee18b7cf8d30982078ad17613ce862657a3ded7081a0a2e57ec0ac45cdbd0a6 SHA512 e47231590a72a057dcf14c2f12545a3a8f2db04dcd1667a04e982c95d48dea29c23376520c3594d48efc1fe7f13045f7dba02bffc6e7d7a8da0947b6baac9e71
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index 7b1952a9e402..c241216ae0b7 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-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 ~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"
+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/epstool/Manifest b/app-text/epstool/Manifest
index f288cbe636b9..e5889e245e3a 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -4,5 +4,5 @@ AUX gcc43.patch 632 BLAKE2B 3f4537c7b4e20e50aafa3d8e07379eb8db2e68c1abbe6e096b2e
 DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
 DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
 EBUILD epstool-3.08-r1.ebuild 904 BLAKE2B 50b366747cd1c79275a6a7c82dfd937ed5d052f81be2ce1c48c0d1f10cf8c59c7dead1ac8e1026fbd8566709ee5aff180c947c26f2b650469128f05a7053b570 SHA512 34323645e925827275dfd63f016a7578eb3d6c0a7bcfa71597afb7b010081caf0bb6e65b8c529dbd7ebb144c6242e71186f6187e76cb3daccdaad3c613016400
-EBUILD epstool-3.09.ebuild 892 BLAKE2B 48f00d7d90a637afa6cafe3721a1fa21c948d78c7c2f1ff165e959d491458aff9859c5197b42d1b22b574941d08487e523113131191181c545ccc582820c97a5 SHA512 a710c0dfe1fdf64c30a2a8da6947e5e372d20fcb8408e87778a4af0633f972cf636690df5e4145f0a32b62cd38e8d1daf1a5d28e751815254dabac633f7439ac
+EBUILD epstool-3.09.ebuild 886 BLAKE2B cf67bedc4e49caa639a51cd322f6306e88304cad9182b6ab0845cb70c002758f791f479a14debdfa08b247531a52d0069270cce716b7d363ce77eff9423290e4 SHA512 1373af9421533ff9a01981cab253376da5d934161180a8a143ce9178ae7d9bb4fa520cafe704d33aa343ee90f9cafb63f96ce451512fc758a5024e467991f928
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 7bbbe381f000..135a57a851c7 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 84ff5c677126..a657f7d42503 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,8 +1,9 @@
+AUX ghostscript-gpl-9.53.3-fix-ps2epsi.patch 537 BLAKE2B fe6bf851c52751e3653e8e7cfac4b5e5e85ec3b9c9a125e5c7e0ca3aeca5cbe0b1ffe068633dd091755bfba410476b1328abbd94af7c90637541215f484e2413 SHA512 901a8a3b2ef645cd1e61f7596aa0f71921d480ebd48249b3d4e0e07dcfc33bb92ba484a28e952575c33062b3f429d8d60b43aeba8ea59a0623b18405dc27515a
 AUX ghostscript-gpl-9.53.3-freetype-2.10.3.patch 508 BLAKE2B 8819f3be84b556adde4808509a1199d08b059a77abeafb6d95076194093a3223cc8c8b7032124eaeaa98dedb237dd94632cb374cb854f7d1594a80b82df79173 SHA512 43bb10cbf6b316d59a616f986fe8bea87af1313ca71138ecdeb531ea2a689c64718c44d0a81f69bdf30e3814fec3b36866c2249d26c6d45c58bd121accc7f8d4
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
 DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
-EBUILD ghostscript-gpl-9.53.3-r2.ebuild 5210 BLAKE2B 9a7fca567d9263eb455e83b1c10e720adf2cac85377f7d2636bf19f7e0c052d467949d4ead0ac1adcc19308df7ad8daadaa76aa6a0b82cb60c98ff727532cd6f SHA512 85a07b3eb6b8a6d3fad665930011d2926057c745dcbb1e38163cb012b0caa53803d58bcdec9d2d1b8caac1f3b5e3fae572b264ea2c0170dd3a091a23ee842a0c
+EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5242 BLAKE2B fc423d68ca4014e41939c1552dd02aaac2f59c81bc183711b08f631358d32853c9516775eba795d9f25475bd93a9473fd7219f82c8af4e2865d59ed7825d8883 SHA512 0785cb794d33caaf17eaba3bea43b41c2838903e0398961aa8bd4d59dfcc0c24d841cc217aef80df56573dc395140477d5bdc243d541e8a042abe39176b7da22
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch
new file mode 100644
index 000000000000..9d7f53e2fd1f
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-fix-ps2epsi.patch
@@ -0,0 +1,16 @@
+https://bugs.ghostscript.com/show_bug.cgi?id=703270
+
+--- a/lib/ps2epsi
++++ b/lib/ps2epsi
+@@ -40,8 +40,8 @@ else
+ 	outfile=$2
+ fi
+ 
+-# Note, we expect 'ps2epsi.ps' to be in the same directory as 'ps2epsi'
++# Note, we expect 'ps2epsi.ps' to be on one of the search paths which can be seen by: gs -h
+ "$GS_EXECUTABLE" -q -dNOOUTERSAVE -dNODISPLAY -dLastPage=1 -sOutputFile="${outfile}" \
+-		--permit-file-all="${infile}" -- "$LIBDIR/ps2epsi.ps"  "${infile}" 1>&2
++		--permit-file-all="${infile}" -- ps2epsi.ps  "${infile}" 1>&2
+ 
+ exit 0
+ 
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
index 3e43e96c815f..48026e1b987b 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
@@ -61,8 +61,8 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	# bug #747808
-	"${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch"
+	"${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch" # bug #747808
+	"${FILESDIR}/${P}-fix-ps2epsi.patch"
 )
 
 src_prepare() {
@@ -107,7 +107,7 @@ src_prepare() {
 
 	# search path fix
 	# put LDFLAGS after BINDIR, bug #383447
-	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PV}/$(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:" \
@@ -183,7 +183,7 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PV}/Resource/CMap"
 
 	if ! use static-libs; then
 		find "${ED}" -name '*.la' -delete || die
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
deleted file mode 100644
index 70614d8072bd..000000000000
--- a/app-text/goldendict/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX goldendict-1.5.0-ffmpeg-4.patch 6184 BLAKE2B 17b8bddeab5bbb6e373c3ee3bfda695ddd363ec733955364b3973f9538cc86bfa5907156704444e31d0c1a99768ff5cc2b577ed2b129100dd1273bbeea1f1eb8 SHA512 596e7ee22e210978ec1f787fd1bb6051f7f9a4d4eb88edb7af40d2e3ba9e66403edb932876a6738c0471c5fe439245e0de61e3c7b57039e0dfd0560f20fd5b8b
-AUX goldendict-1.5.0-qt-5.11.patch 1532 BLAKE2B cd6869c59d2afef21d92660173516b56a880cd245e5b928096d9d3d6e8e4fc915694a5dedd762400be091dca6a86fed2b553ce11688e84117ef4653ab1124ce3 SHA512 25721bf8cca9e0abb3f04dd912520577f7c3a31d34883887286476895263049495e3286c520549409ec8244f99b632b4a76f0ce514b8509e5e16a12adc3a5ac6
-AUX goldendict-1.5.0-qtsingleapplication-unbundle.patch 341 BLAKE2B 7f5b2c715d41d50d358a8cca5f259f8b70266b9037dac9f5f6c9c0b1323b46cb42f68fd73725a6f25903e35a83582b32015b3401f1aa3a8f9c8bb1a05c54b531 SHA512 86a08b1333a61fee7559028f68779f45cf17da6f7e6f3ea9cae46184279469b91e38f825ad072e0557bcd4188b87fe8f0bd696c4819e3bc96874439d1290e5a3
-DIST goldendict-1.5.0_rc2.tar.gz 19413751 BLAKE2B 17fb0140e6ce392800a05d36a41f2a42c813990eaecabf55f765d5583118be694e66c5438b90e46853070a782086422b533b0f653461dd81cecd23f2deec40b7 SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
-EBUILD goldendict-1.5.0_rc2-r2.ebuild 1733 BLAKE2B 32cc3ef1affb914a3b939765ecf656bf48167352c54863dcc1def0abbe287ae0148863b18af19c7ffad38677141bac148803b69f9321048375c4f900949a80fb SHA512 fde5f8df0b18a7c7f325cf0a8f4052345f604425028120eadbc21d812c807615d1580a1dc68cbfe965223074779ce46ed5912742cdb33c09f2bf77cfa9622051
-MISC metadata.xml 388 BLAKE2B 229d847f632fe3da3df10913551df5ee6ee386768c52aef7c436336476c7e837272decbe34a7e9322504e6d97e7319afb61815539494ef5faa8c93411ce7215d SHA512 c9be98ab768c3c13ff4b03336fc90314ec0e233d0860501d85b5c65250965d994a3f8ab4cf8f58cee3da27fdc37964c10854bc66b9cc16e5f558f0b7a4a39f42
diff --git a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
deleted file mode 100644
index 6e6d03675a4f..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
-From: Abs62 <ottomann@yandex.ru>
-Date: Fri, 30 Mar 2018 22:53:24 +0300
-Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
-
----
- ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 62 insertions(+), 6 deletions(-)
-
-diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
-index ed1172bd..56e8f788 100644
---- a/ffmpegaudio.cc
-+++ b/ffmpegaudio.cc
-@@ -91,6 +91,7 @@ struct DecoderContext
-   QByteArray audioData_;
-   QDataStream audioDataStream_;
-   AVFormatContext * formatContext_;
-+  AVCodec * codec_;
-   AVCodecContext * codecContext_;
-   AVIOContext * avioContext_;
-   AVStream * audioStream_;
-@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
-   audioData_( audioData ),
-   audioDataStream_( audioData_ ),
-   formatContext_( NULL ),
-+  codec_( NULL ),
-   codecContext_( NULL ),
-   avioContext_( NULL ),
-   audioStream_( NULL ),
-@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
-     return false;
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
-   unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+#else
-+  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
-+#endif
-   if ( !avioBuffer )
-   {
-     errorString = QObject::tr( "av_malloc() failed." );
-@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
-   // Find audio stream, use the first audio stream if available
-   for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
-   {
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
-     if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
-+#else
-+      if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
-+#endif
-     {
-       audioStream_ = formatContext_->streams[i];
-       break;
-@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
-     return false;
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
-   codecContext_ = audioStream_->codec;
--  AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
--  if ( !codec )
-+  codec_ = avcodec_find_decoder( codecContext_->codec_id );
-+  if ( !codec_ )
-   {
-     errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
-     return false;
-   }
-+#else
-+  codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
-+  if ( !codec_ )
-+  {
-+    errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
-+    return false;
-+  }
-+  codecContext_ = avcodec_alloc_context3( codec_ );
-+  if ( !codecContext_ )
-+  {
-+    errorString = QObject::tr( "avcodec_alloc_context3() failed." );
-+    return false;
-+  }
-+  avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
-+#endif
- 
--  ret = avcodec_open2( codecContext_, codec, NULL );
-+  ret = avcodec_open2( codecContext_, codec_, NULL );
-   if ( ret < 0 )
-   {
-     errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
-     return false;
-   }
- 
--  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
-+  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
-           codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
-   return true;
- }
-@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
- 
-   // Closing a codec context without prior avcodec_open2() will result in
-   // a crash in ffmpeg
--  if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
-+  if ( audioStream_ && codecContext_ && codec_ )
-   {
-     audioStream_->discard = AVDISCARD_ALL;
--    avcodec_close( audioStream_->codec );
-+    avcodec_close( codecContext_ );
-+#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
-+    avcodec_free_context( &codecContext_ );
-+#endif
-   }
- 
-   avformat_close_input( &formatContext_ );
-@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
-     if ( packet.stream_index == audioStream_->index )
-     {
-       AVPacket pack = packet;
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
-       int gotFrame = 0;
-       do
-       {
-@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
-         pack.data += len;
-       }
-       while( pack.size > 0 );
-+#else
-+      int ret = avcodec_send_packet( codecContext_, &pack );
-+      /* read all the output frames (in general there may be any number of them) */
-+      while( ret >= 0 )
-+      {
-+        ret = avcodec_receive_frame( codecContext_, frame);
-+
-+        if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+          break;
-+
-+        playFrame( frame );
-+      }
-+#endif
-     }
-     // av_free_packet() must be called after each call to av_read_frame()
- #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
-@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
- #endif
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
-   if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-        codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-   {
-@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
-       playFrame( frame );
-     }
-   }
-+#else
-+  /* flush the decoder */
-+  av_init_packet( &packet );
-+  int ret = avcodec_send_packet(codecContext_, &packet );
-+  while( ret >= 0 )
-+  {
-+    ret = avcodec_receive_frame(codecContext_, frame);
-+    if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+      break;
-+    playFrame( frame );
-+  }
-+#endif
- 
- #if LIBAVCODEC_VERSION_MAJOR < 54
-   av_free( frame );
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
deleted file mode 100644
index 247ec52931b9..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001
-From: Abs62 <ottomann@yandex.ru>
-Date: Tue, 10 Apr 2018 18:44:43 +0300
-Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991)
-
----
- fulltextsearch.hh | 1 +
- initializing.cc   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/fulltextsearch.hh b/fulltextsearch.hh
-index da7e2943..adf9619f 100644
---- a/fulltextsearch.hh
-+++ b/fulltextsearch.hh
-@@ -6,6 +6,7 @@
- #include <QRegExp>
- #include <QAbstractListModel>
- #include <QList>
-+#include <QAction>
- 
- #include "dictionary.hh"
- #include "ui_fulltextsearch.h"
-diff --git a/initializing.cc b/initializing.cc
-index 0db6909b..59e605d6 100644
---- a/initializing.cc
-+++ b/initializing.cc
-@@ -1,6 +1,7 @@
- /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
-  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
- 
-+#include <QIcon>
- #include "initializing.hh"
- #include <QCloseEvent>
- 
-From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001
-From: Perfect Gentleman <perfect007gentleman@gmail.com>
-Date: Wed, 11 Apr 2018 00:04:12 +0700
-Subject: [PATCH] Update groups_widgets.hh
-
-fixes https://github.com/goldendict/goldendict/issues/991
----
- groups_widgets.hh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/groups_widgets.hh b/groups_widgets.hh
-index ce442fa2..2064e3bb 100644
---- a/groups_widgets.hh
-+++ b/groups_widgets.hh
-@@ -8,6 +8,7 @@
- 
- #include <vector>
- 
-+#include <QAction>
- #include <QListWidget>
- #include <QSortFilterProxyModel>
- 
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
deleted file mode 100644
index 01fdb3b2a297..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/goldendict.pro
-+++ b/goldendict.pro
-@@ -36,7 +36,8 @@
- QT += sql
- CONFIG += exceptions \
-     rtti \
--    stl
-+    stl \
-+    qtsingleapplication
- OBJECTS_DIR = build
- UI_DIR = build
- MOC_DIR = build
-@@ -632,5 +633,3 @@
- TS_OUT ~= s/.ts/.qm/g
- PRE_TARGETDEPS += $$TS_OUT
- 
--include( qtsingleapplication/src/qtsingleapplication.pri )
--
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
deleted file mode 100644
index d8de78923963..000000000000
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV^^}
-MY_PV=${MY_PV/_/-}
-inherit desktop qmake-utils
-
-DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg "
-
-RDEPEND="
-	app-arch/bzip2
-	>=app-text/hunspell-1.2:=
-	dev-libs/eb
-	dev-libs/lzo
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/libvorbis
-	media-libs/tiff:0
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXtst
-	ffmpeg? (
-		media-libs/libao
-		media-video/ffmpeg:0=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch"
-	"${FILESDIR}/${PN}-1.5.0-qt-5.11.patch"
-	"${FILESDIR}/${PN}-1.5.0-ffmpeg-4.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# disable git
-	sed -i \
-		-e '/git describe/s/^/#/' \
-		${PN}.pro || die
-
-	# fix installation path
-	sed -i \
-		-e '/PREFIX = /s:/usr/local:/usr:' \
-		${PN}.pro || die
-
-	# add trailing semicolon
-	sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
-}
-
-src_configure() {
-	local myconf=()
-	use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 )
-
-	eqmake5 "${myconf[@]}"
-}
-
-src_install() {
-	dobin ${PN}
-	domenu redist/${PN}.desktop
-	doicon redist/icons/${PN}.png
-
-	insinto /usr/share/apps/${PN}/locale
-	doins locale/*.qm
-
-	insinto /usr/share/${PN}/help
-	doins help/*.qch
-}
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
deleted file mode 100644
index 54e5ea46ce69..000000000000
--- a/app-text/goldendict/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="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">goldendict/goldendict</remote-id>
-		<remote-id type="sourceforge">goldendict</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index c542aea228ff..d55f1f0f70da 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,4 @@
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-EBUILD highlight-3.57-r1.ebuild 2805 BLAKE2B 7f99799eb755da57d7540a9af08a183867ed558b343cb4013f2611937faf54a28f69cd10d03fa407334a5004ae3ca69c53a74ffdf2dda0ac385d7383e1fef80d SHA512 87a986128536dc5a9cf74ba08fedeeff4646dc7ad03ed3b02659c836ec5c7580fce5a6356a654582c5ca98c36fd911957f9ba31f6cdeb087bf42791c231717dd
+EBUILD highlight-3.57-r1.ebuild 2800 BLAKE2B 0a31b7d18381d608fe24f9e7ee999aabe95398f7e75a6760ed4cf3f9fe1ae5b40b67ac32346223dbe45ec09e3f22ed24a54df518d04402f90f302c4f7147c2f1 SHA512 67c74eda4c2868cafe4e21a974ec75d8eb88f464f3f6b3d3e87ecb534bcfdbcb3df665e54ac9ff74d6ad1e6ff333445f43d1c064617ab23f4d5c1d099caa3ff6
 EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild
index 079ca0895c88..515f2314f4fc 100644
--- a/app-text/highlight/highlight-3.57-r1.ebuild
+++ b/app-text/highlight/highlight-3.57-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 ~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/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
deleted file mode 100644
index 2cc3aef4d590..000000000000
--- a/app-text/kchmviewer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kchmviewer-7.7-force-qtwebkit.patch 960 BLAKE2B da573cf4eb4a2668b7d37356df270f002cda5f1ca54055fbed36dc9f95bd8373934d8befa2b635f23074e0ce69cb9707cfd41cfab223c6254cb68c4fdade8a3b SHA512 bb93256211bc7390acb52b142da5cd12dc4c8220fdf745c6b5dcc93bfba8880272ad0134c868409afe5fe6ea3bcae47cebe1aaab13cdead6556bf15bd838b549
-AUX kchmviewer-7.7-underlinking.patch 300 BLAKE2B 02d86fad61fe727e5bebdd8b340bd9a70ccde78d04ef65b2dcbc517a76304b5788412d16ba727bc7575087a9c0229c814550c25f80edba6ca6332a9dfd366f8d SHA512 004056e7ba232a80f76fe7a8955a2ef621d8148f7c594c78ae3136dca7ca8d3c39e8ab3081f75b3181bef3c9a720601cc7e65ba371b95853faa4bf845e80d0ec
-DIST kchmviewer-7.7.tar.gz 345952 BLAKE2B 7c42f3d05c7a46163d4e63af271ba73932dc2f7eb20e4e0c2c5dc2b335f488593288e4dd5b0a03b75ee7a008836a16b86ec8f47aa6d076b6351d48290a23bdef SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070
-EBUILD kchmviewer-7.7-r1.ebuild 853 BLAKE2B a3446cc96aff7a0ac09e42ac9cead41dc91420e3f18a86b07f7bf709c5b997014b2662ad6006d7f044cecd21cf74ba226f567e0303ffd2450ee22ee4a413d80c SHA512 25fbacdbb184f424140995c2dbdea683be9f35a8cb79c43874df80a59ae7ad399e9028f0ec7c99e9573563e8357016c98dbfe4c36f30ebb0e609ffad878d6f04
-MISC metadata.xml 982 BLAKE2B ed5f9ea7ed6aa8a2b6d743ad2944bbfbe46638f3c0e2b154b8abe250d2b7cf0a56ad48cb4df994fe2c1df1cde7c7a612f3c681107d0b5c1f8652072e15ad5cc8 SHA512 746f5a51bc2e4373f41a24f71e2f19647f70a53439a1f40933f32405b3a9c2fdec6130bbe2ecd2cee0b1901f87a5bae12cfa782ab44a37f5ecce61727a16ae91
diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
deleted file mode 100644
index 897c62a998c2..000000000000
--- a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Gentoo still ships QtWebKit in 5.6 and later, so don't try and fail to use QtWebEngine.
-
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -113,21 +113,11 @@
- }
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
--    # Qt 5
--    greaterThan(QT_MINOR_VERSION, 5) {
--        # Qt 5.6+
--        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")
--        QT += webengine webenginewidgets
--        DEFINES += USE_WEBENGINE
--        SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp
--        HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h
--    } else {
-         # Qt 5.0-5.5
-         QT += webkit webkitwidgets
-         DEFINES += USE_WEBKIT
-         SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp
-         HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h
--    }
- } else {
-     message("Qt4 is not supported anymore, please do not report any errors")
-     QT += webkit webkitwidgets
diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
deleted file mode 100644
index 75bfed89cbdd..000000000000
--- a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -108,7 +108,7 @@
-     HEADERS += dbus_interface.h
-     SOURCES += dbus_interface.cpp
-     CONFIG += dbus
--    LIBS += ../lib/libebook/libebook.a
-+    LIBS += ../lib/libebook/libebook.a -lchm -lzip
-     POST_TARGETDEPS += ../lib/libebook/libebook.a
- }
- 
diff --git a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
deleted file mode 100644
index 7864d2f6a305..000000000000
--- a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="Feature rich chm file viewer, based on Qt"
-HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
-SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/chmlib
-	dev-libs/libzip:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-force-qtwebkit.patch"
-	"${FILESDIR}/${P}-underlinking.patch"
-)
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dodoc ChangeLog DBUS-bindings FAQ README
-	doicon packages/kchmviewer.png
-	dobin bin/kchmviewer
-	domenu packages/kchmviewer.desktop
-}
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
deleted file mode 100644
index 9826a818187b..000000000000
--- a/app-text/kchmviewer/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		KchmViewer is a chm (MS HTML help file format) viewer It uses Trolltech Qt
-		widget library with optional KDE libraries. It does not require KDE, but may
-		be compiled with full KDE support, including KDE widgets and KIO/KHTML. The
-		main advantage of KchmViewer is extra support for non-English languages.
-		Unlike other viewers, KchmViewer in most cases is able to detect help file
-		encoding, correctly shows tables of context of Russian, Korean, Chinese and
-		Japanese help files, and does correct search in non-English help files
-		(search for MBCS languages - ja/ko/ch is still in progress). 
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gyunaev/kchmviewer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 55fd952b377a..f4acb604101c 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,6 +1,6 @@
 DIST nfoview-1.27.1.tar.gz 60211 BLAKE2B 777d9f42a08a17d3790996ff76819a0b74c6e1f01625019259524e6e5cee9afc72ae463085071e4a23cefeebaf5b14f1bbeae949446356ed1aaebebaaf53e230 SHA512 7066995954997a20aec27ff820c0f0a067835e219f9029f696b2885a85c4714b32fc8d474291433f64d9b28e81e5f4c24989a6447affc7b206cef453342a05d2
 DIST nfoview-1.28.tar.gz 61164 BLAKE2B 7fb1f150d343d5133e411486f3bff7315765187920dc5821de7d717f3381b6126263585a23fdb7847403ae992ee98b7503f7313a312adb0e6b2fb992e69da4a8 SHA512 652ed3a5dd3cad547c6c0f93a0c686c42e9fc58e2f90a682432cbcb865a1b6ab6cb55424ed68128718c0c867ad353d170ecf54619f7006445cb9761bced2bbd3
 EBUILD nfoview-1.27.1.ebuild 872 BLAKE2B 7b70a94c6144642e519476ccf2f44d1a07168493ff23b460237bbe9d62569f98fc0d812a46bc45674198ff0cbee091275fb63bf98369d42915c257f9b41f85dc SHA512 1b0b399f1ef009998b47d46f0d45f2130ef1cc6d62d50c993eb2be95f118e4d1afce962868763d4c177a74744a8b968312c2910c92a4723a29409f0741544f61
-EBUILD nfoview-1.28.ebuild 872 BLAKE2B 0e0ea4b94556b7221137cbf1d4bde727854a8318b0d0e32f60951acf3df9f9945986ff1d31b2b41d6328d073bc1ea5aed073ed4a575711a7b694cc4003c67393 SHA512 3595e083ab06bcc9fdd85e6035e4ad380416e6484534e142b1e15b416ed98ce0627af3ab6093bff01bf467a8bf4c6267c2bdb47d649c664719fb6cf043586ae7
-EBUILD nfoview-9999.ebuild 817 BLAKE2B 47ada35bd06c2a1c43d78f598de8858e6a7bafcd9dc79987515155bbccdb4922288fb8374db2b3413c545bf7f2055f70a1eeda8b2f35009f6314424dec48b276 SHA512 56111d9d3a08543a698ef7319ca3ed2312955f0b611ce7069f24d6ce3957d30cc884b4ea9ec37f8749d31956b76c17786221c5829a9cce6e1dd0dbce640d1386
+EBUILD nfoview-1.28.ebuild 718 BLAKE2B cbeb8357b83d22d0521b2bf287d6b9fa107998d11a43beae35e93d8eebfa0f3c73d2372822a381053fc994d511e205d59fc1c54822e3aeb18298358512e5e04a SHA512 959081bf5947e081502adce69c1694dea4cc0cae0aee82abf4e7eb43990308d80707861dbfef2a67ab2443cd1c31b254e4675baa2db68532d85cc7f2d6f41ff9
+EBUILD nfoview-9999.ebuild 718 BLAKE2B cbeb8357b83d22d0521b2bf287d6b9fa107998d11a43beae35e93d8eebfa0f3c73d2372822a381053fc994d511e205d59fc1c54822e3aeb18298358512e5e04a SHA512 959081bf5947e081502adce69c1694dea4cc0cae0aee82abf4e7eb43990308d80707861dbfef2a67ab2443cd1c31b254e4675baa2db68532d85cc7f2d6f41ff9
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.28.ebuild b/app-text/nfoview/nfoview-1.28.ebuild
index ac3f5a722095..7118320a0467 100644
--- a/app-text/nfoview/nfoview-1.28.ebuild
+++ b/app-text/nfoview/nfoview-1.28.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 xdg
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
@@ -21,20 +21,9 @@ HOMEPAGE="https://otsaloma.io/nfoview/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext"
 DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	media-fonts/cascadia-code"
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
index a6e9e5a10d68..7118320a0467 100644
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit distutils-r1 gnome2-utils xdg-utils
+inherit distutils-r1 xdg
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
@@ -20,18 +21,9 @@ HOMEPAGE="https://otsaloma.io/nfoview/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext"
 DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
+	media-fonts/cascadia-code"
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index 32e4d7826ec1..66f495588bb0 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 1162 BLAKE2B bbd33b82dc461ea868020c56ae8f541cd28ebff1f4aa3b1f575c55f87a3719aae478de5305144147977368609d7f035a879c877fc72749f3cd913dbfab5cbc28 SHA512 e86aa624ed0c286108d4f7a58dc3df9cdba20bb8080baeabbf9c6f1db4174047ecf33df5949951f6c4358a4e621e952c84f15a64d73aa3722402888448b37b33
+EBUILD ronn-0.7.3-r3.ebuild 1163 BLAKE2B 69f0e58f11eeac58714bcef08c6e62ec182ebdd68c21e0b589db88eee8209a696f6d62da1ff1a6a78c08ecdcfad892966af16dcd53fb77d4ecbfc2a756706ce4 SHA512 6714f18e70c27e9a67a6dfab82a34d9505f5b975204f57ef0bf9c843872fc18429a592d8d762fde9877145977fc5669d67cd4da009a6fc8364b9e755a607409d
 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 530dda183ad5..c5fb5a2862b9 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="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 0f5b94e153b6..1f0cbada38bd 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,10 +1,6 @@
-DIST scdoc-1.10.0.tar.gz 12414 BLAKE2B 3111b3ace102aca2f7da86e510e00f552874817b6b9d754770bd94f9482e4e444a4bc4d44a8317376a6c374bb7363eae96a49281fefd95dd663134087123034b SHA512 546743376380d84aa9c8be65529dbbe1634e574203220ce1c057341436bd3a15297f393ca79d29372cb125bf457cfc00f64ba2867b8d2e910ca6531acb552e97
-DIST scdoc-1.10.1.tar.gz 12422 BLAKE2B 4aa5b28994cd03f5d3fc9fff253a02f1052653d25d41225665219ebb6322ebe69f2671d91c5cfe201fd7f9b1ac06f38db3dd126492da06fef0b692fc040300d5 SHA512 356aee85c4676a1fbd7367c6087dd7f6f4d33793be0f3fef74803ceb93c0a9e45c78022d219dc08a7d79d71c393849fa3113c36a85d5d60ed474b62bf5f89743
 DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
-DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47ba0b4e6fa86f7abdc52b06a2dfcfd632b16dc7bce6e5ef3b0dbb40ce9170e678bc17c0a4e43dcc0099a1dc SHA512 77be81f042e2099de7fc84b0161bc8a95d5c3dde662284613d84a1e249fa0aa51dad73f53f265c833526d40f5e1f19fce99dc5cd6df35efb0a323c3db6084a55
-EBUILD scdoc-1.10.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
-EBUILD scdoc-1.10.1.ebuild 1185 BLAKE2B 461515e1fe30b3c6213e9d58c9d005ba3a8866c493a90785b6907a30d3ba2dc819122ed44a79c38d11141ec4df14edb56e998a469776e0cb619db26ba838c37b SHA512 f740888fa375d7ee55730b3ed099ff3f233e88f0d8f80deb8ce063f717ab1dc9eb7df945aef834b026aa2fa9243b9a2658b6015683213ec08b914ed20f9ed7ab
+DIST scdoc-1.11.1.tar.gz 12482 BLAKE2B 2632da654730a373f03955f0b3bb190c8d6beb2fd4e4b05c88a4c86d384b26c51a8f032e6b2ef8d4d795638c1981a4d5500384f3103411869c7097a2ba1466ff SHA512 28b676a2ba69a101034c47378c4b66c94bfb9903d680a1871020fd8772d0990a4c91678738f71d37bfca06e27991ef782047c6503d375ce69df744caf6b459de
 EBUILD scdoc-1.11.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
-EBUILD scdoc-1.9.3-r1.ebuild 1182 BLAKE2B 1d6f07981f9117ae906d84b52e8f65eb10da65b993506e2a24a465c59933af440d38d3d136613a47e936bf622f8a9879ff957ab4111a510ec812002b6b381bf0 SHA512 f2e021e0df03289c46e163c5f07f73898871795f250ca3a1e2d52f06af2de6718e8b1b5c9b7e2fbad368c0e0595cf0778a707026dd767135360811015b1b0b7d
+EBUILD scdoc-1.11.1.ebuild 1185 BLAKE2B 461515e1fe30b3c6213e9d58c9d005ba3a8866c493a90785b6907a30d3ba2dc819122ed44a79c38d11141ec4df14edb56e998a469776e0cb619db26ba838c37b SHA512 f740888fa375d7ee55730b3ed099ff3f233e88f0d8f80deb8ce063f717ab1dc9eb7df945aef834b026aa2fa9243b9a2658b6015683213ec08b914ed20f9ed7ab
 EBUILD scdoc-9999.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
 MISC metadata.xml 422 BLAKE2B ec662d4bd34390be05318e8816524f206decf6e3cf97ee6e132405a7a2bdd33839b5b82e8083bd3fedc8d390871275ecc9490252cdeb883994e35d511cb8b7d4 SHA512 09dc27076a9ffd2c3f94b40b9df84cbb02317dee7235cb0ce358890c93667dacfc3a7adfe09cf949b8f63970983a7ed7ff654a9ec290b58c6f4ac6b05f9579e1
diff --git a/app-text/scdoc/scdoc-1.10.0.ebuild b/app-text/scdoc/scdoc-1.10.0.ebuild
deleted file mode 100644
index 9460e30e3a9a..000000000000
--- a/app-text/scdoc/scdoc-1.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
-	inherit git-r3
-else
-	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
-	default
-
-	sed -e 's/-Werror//' \
-		-i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
-	local MY_HS="./scdoc"
-	if tc-is-cross-compiler; then
-		tc-export_build_env
-		MY_HS="./hostscdoc"
-		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
-		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
-	fi
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
-}
diff --git a/app-text/scdoc/scdoc-1.10.1.ebuild b/app-text/scdoc/scdoc-1.11.1.ebuild
index cb6340289500..cb6340289500 100644
--- a/app-text/scdoc/scdoc-1.10.1.ebuild
+++ b/app-text/scdoc/scdoc-1.11.1.ebuild
diff --git a/app-text/scdoc/scdoc-1.9.3-r1.ebuild b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
deleted file mode 100644
index 88d71fc2d038..000000000000
--- a/app-text/scdoc/scdoc-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
-HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
-	inherit git-r3
-else
-	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-src_prepare() {
-	default
-
-	sed -e 's/-Werror//' \
-		-i Makefile || die 'Failed to patch Makefile'
-}
-
-src_compile() {
-	local MY_HS="./scdoc"
-	if tc-is-cross-compiler; then
-		tc-export_build_env
-		MY_HS="./hostscdoc"
-		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
-		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
-	fi
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
-	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
-}
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 041c892f895a..269e2e213f5d 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -3,5 +3,5 @@ DIST txt2man-1.7.0.tar.gz 17142 BLAKE2B 56dd6e09ed52cac0b203f68b6fe56550b13f4d2e
 DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e9068623cae7a3ac853aa6fc4b5bda1db8969fbf2798b84daf84a46ad29e9bf9945cf62b51b90592300e255a3e2b SHA512 550b1d30a4435f35d03920d89f5f2adc2a937de7575c4ddc51ee9f4fe370975b45e51f5aec0eb865ead4b16d88ad31f3150cd3235362b1fc7e6d7b3c6233852a
 EBUILD txt2man-1.6.0.ebuild 609 BLAKE2B 5791269461f773391ba2080795d7689a9347d36bde85bd2152e62f7215368c47df1e82f2b31d7827c6bb2765976871e31dee9cd06efb3b4811cc657d72332f60 SHA512 312045664e536ae8147e641fda6a3726ad629682f1fe3ef1696a8cd8163fd115ee6082747612157e003cdc62269e108afff65d75c68d505d4865092923bf794f
 EBUILD txt2man-1.7.0.ebuild 615 BLAKE2B b48cb60e8d392a7b2fb1f17aa04a83da7cff32574027cd5fe02551225cf0c43c3405a470157cfd3ec6abb96a14d64e894354f2a4d0c032b90d5e1476b8a95baa SHA512 e619cb6677bf3da4f88993c8b0dbe0efa74ae3a986c9888297d09c741a0d313cef7c4133d8609a04eafd09dd23058b98d7bb498b4952f15d39b782a17c2d9380
-EBUILD txt2man-1.7.1.ebuild 602 BLAKE2B 623ab5c12b5e67319fcc11bb43a44aca60e01f581842f0aad6cff719eba6551e2f35e9b716d7f60dc5b4a5b99e761d7fd2652e541cce1779328c8d5fbc32f5c8 SHA512 74c78ac586d3a8dd930853de88dfa429ceba69f4dfb58d166dfe8d601b88248d97e5f308468345b1396261b11d064aabe880ec8bcd29cee30c8d917e5545e211
+EBUILD txt2man-1.7.1.ebuild 599 BLAKE2B 39eac741ced9ca129204401471d98920c6663061977c35c1a83762a6162bde514eb350a368047bc52d8eeecba0fe587d234b4de54987646b89583aa8927da56c SHA512 44e44671d75b9c4b3acf37a3772d5fee2e0707296472cca68167bb8cf04b4ed132a5ef265f6e6bbf2f4c75c4322b7f670d957eb0a713408f7c82e588ef4a26ae
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
index bc21fe17a3aa..e0becc35c0c2 100644
--- a/app-text/txt2man/txt2man-1.7.1.ebuild
+++ b/app-text/txt2man/txt2man-1.7.1.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/txt2tags/Manifest b/app-text/txt2tags/Manifest
index c0288a5e359e..6f0393f2871e 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,5 +1,5 @@
 DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
 DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b
 EBUILD txt2tags-3.3.ebuild 542 BLAKE2B 2c4d3d8baf02068f7e616cff10f714cf9075620f876a3801db2f767cb2bc9a10565847607482e19cc19e918c3bdbd942004ba914f80e36356498fd808a4bb4d2 SHA512 4b5c17e1d3ca3ca848e7f87c28984c322f747291d5762aa865559c7b5be594a1b053d75fdb6999b7216b9f51330bd76f5a4cb67c41308daa0ce42279c0876a21
-EBUILD txt2tags-3.7.ebuild 541 BLAKE2B 0fa081196b5c005f4df20d707d424c768f14c25cd2d81bcd36f7e0c83838f76b0b8e5e27e46cd8579592e405d41ad34655e515ef94d46af2b30c9084a57d0c92 SHA512 27b61c88b23dbf8d1b957bfbbe5e2eb32a71e6012d3ce12f7abe8b3da99bd039b249ce9431f2e00b35a60f41cc940ec4c6e417c98cd712711bb563269c2a8e71
+EBUILD txt2tags-3.7.ebuild 540 BLAKE2B 2d2e8e2ed987320f473acf5e977f700bcd4cdd368b57425a868c0f9c285aa29c5792f1ada985c03aa3c327b623491dedace49fb45cd774517e24af72ef6f9c26 SHA512 e6f6cde7f386780363dacafcb4cee4b111d7edd873a52b4c337cbc76435a781e654708fdb402fd0bf56328b8c0a30d671180f32b9d1f88cd71fa6b4856617146
 MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
index 38feaf39ef12..0ef8f7c72887 100644
--- a/app-text/txt2tags/txt2tags-3.7.ebuild
+++ b/app-text/txt2tags/txt2tags-3.7.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 5ee968c4735a..3ac0fce18f33 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -4,6 +4,6 @@ AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab2
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
 DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.31.ebuild 947 BLAKE2B 2e5fe64c1009644c937f5001dbee0225753261825fee7ff78b59e851ad326962d2e508784461f15f092057b3ba970a4a09d520399f831b0f9a19d6b9d18bddb9 SHA512 8416e9df53ea552ac898762b3dd3e26bdd64fb27cf49e996864f557f3245c8d56bbb52c5a85e6c50e7f5dad54e60c9ff7e1c2f83c723986eddf5ccf2db5d5e5e
+EBUILD xchm-1.31.ebuild 946 BLAKE2B 3a79a20c9adc1a6263549c3449fa1c1f36ed7c99808b08007b34d15006de214c0bd34e1b134ef3c77350ab84c890bebfac4a9b78e43f251353b0315f507042c3 SHA512 03e41fdc435f95c64017bd39177997b2e6c40c17f4de4fd9fa295ac050203f9c156913fb8e333b267279d151276a718e070a2f24d76dbda1846c408b9ef307a5
 EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
 MISC metadata.xml 370 BLAKE2B b7a2c5ee6e02f758f53ae1f67a982d8e3c0ceffed66524c9072801bc3cb803419824ce0a30b59f9dd16cae6381ae3b1a28a9b084c6dd71ab8d68a3a9be36e5a9 SHA512 f926ec5a7690046f0c1e73da64d5ab9eb662491cdb2ad24d44455ee5a4e94693188a3c8c17f777a0da120a44d57ca00f5713f5472c75f44215213ce41aceef2d
diff --git a/app-text/xchm/xchm-1.31.ebuild b/app-text/xchm/xchm-1.31.ebuild
index 276ca9d35624..de5c0956e1ac 100644
--- a/app-text/xchm/xchm-1.31.ebuild
+++ b/app-text/xchm/xchm-1.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/chmlib-0.36