gentoo (valentine's day) resync : 14.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
commit: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree: c44943ee0563a3fa957716de909fed683117fcb9 /app-text
parent: 69051588e2f955485fe5d45d45e616bc60a2de57 (diff)
84 files changed, 616 insertions, 318 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 12a70fcf8036..ff6444bda35b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 39642cc3f578..00ec85b74f11 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,5 @@
 DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
+DIST ansifilter-2.18.tar.bz2 436432 BLAKE2B 43c592e83a967ee86404332a464d57d202a73651b2e29da2d1d21163d295b6efba96ecb5861dacfa89b8f567c0367f7a32b8e658f8cefad82c5982f2f2bf70bb SHA512 ef7febed1fc31f5c7503648e4fc0a7aefc3da8e30ea649bd6f03eac2904667fb779049106ccb77ad16fbf655e979f6651b25b84ab126c940c66bedee115a28e2
 EBUILD ansifilter-2.17.ebuild 1126 BLAKE2B 18f2588012469516c0f65158f57bb6659ba36c13b062764cc7d905cf23cf7f3ed1b0c4bec064b80aa2a2b3d1a0917571897057c8a46171c103f27cd4bd002ec7 SHA512 e144c52557f2af3c7d0f3a8c7ebed27682667204bdceeb4b7d6482f1c94c94cae4603ac87e5af69c570e5d9bc67d48db84233fa81a38e33545bf37e27197d51f
+EBUILD ansifilter-2.18.ebuild 1131 BLAKE2B 331b5ab4a4adda957b863ccd733776aff805e71ad0f82d04b782d2aeb72416bcfb9a3ba54bc871cebf18e3460d2ba933090b4775c5824ea261337248b5f59431 SHA512 52b2df0a11bdd970c2f8e9c7bdd8085ddc441d2ba5eaf8eedaea22b7c68d0b1b07cca44c18a939ff0ce25416908dcf4805d3ffcf03867feda94786af4de1bfe2
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.18.ebuild b/app-text/ansifilter/ansifilter-2.18.ebuild
new file mode 100644
index 000000000000..f1a848e9dc45
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.18.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 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 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="qt5"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog.adoc README.adoc  )
+
+src_prepare() {
+	default
+
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+
+	sed -e "s/-O2//" -i src/makefile || 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 CXX="$(tc-getCXX)"
+
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dobin src/${PN}
+	if use qt5 ; then
+		dobin src/qt-gui/${PN}-gui
+		insinto /usr/share/applications
+		doins ${PN}.desktop
+	fi
+
+	doman man/${PN}.1
+	einstalldocs
+}
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index a366eda88474..a4878461beed 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,7 @@
 DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624
 DIST asciidoc-9.0.4.tar.gz 1111102 BLAKE2B 3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f SHA512 9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b
+DIST asciidoc-9.0.5.tar.gz 1119318 BLAKE2B 3e5a454f4d47bb3c71e4c180ab05a0d23985473ca83d987435614ddafc9ee0d340a6e6cdafcb7371f719487954233f6d4bae69b4fc7d3818fc1d8e91c94ef36e SHA512 5b79d74c1efd43a960e8a415d3a68f26dcd3a3eee748b830101cec69475b0af40de7ad190ae105cade8ee558a59a643d04f38c1be490d253e3a6740c347d94e3
 EBUILD asciidoc-9.0.2.ebuild 2337 BLAKE2B 19c198213cc90c59641f89cfa9f483b1d5796c2b1e53329ed5a45774607e72cb60dc6a54caab8c32e0061e4d55e9f935dd760cb2106ff7f6cbb063f65aefde73 SHA512 b2491f68d4ebf1fece0af110f465755f8e2bbb97f575923e8f3788f01496a2adb2ec56aa543ef2a2de10bfff3f335fef0b7a2c11b4241cb025b772c31121304a
-EBUILD asciidoc-9.0.4.ebuild 2346 BLAKE2B 80653cf44e489e875e63225de8cc7e5a16690093b456d85503cf81167161623dfc656fbc727b0f6d508a3b52d52e5ca4f3b668b6fbfe12e6b825757aba531b38 SHA512 97ebf07a34348e36fbb56d190978c333b2df2c5b196114bfd8123187f5f86f42024f640fc1825d99a5acf9e5235eddfbf6b436559706db0249ebd426c6809e55
+EBUILD asciidoc-9.0.4.ebuild 2342 BLAKE2B 786016088e32e9bd3178decee728198552021205125efc7ef33d5d0a7fabd29a7eddd8e1831eef9cdd7f21292f3c794392b73011f68fc3b3a235ab4f51fe81e1 SHA512 73777793fb1190fef6f505bbbfee83916bc5c16e4f72467201c46661e232a97ec9865224253675dd57d4b8786eee7e89ebb6795e69968b9d28f4c296ee1836cb
+EBUILD asciidoc-9.0.5.ebuild 2346 BLAKE2B 80653cf44e489e875e63225de8cc7e5a16690093b456d85503cf81167161623dfc656fbc727b0f6d508a3b52d52e5ca4f3b668b6fbfe12e6b825757aba531b38 SHA512 97ebf07a34348e36fbb56d190978c333b2df2c5b196114bfd8123187f5f86f42024f640fc1825d99a5acf9e5235eddfbf6b436559706db0249ebd426c6809e55
 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
index 3b4cdbf3dd7c..853b154e566a 100644
--- a/app-text/asciidoc/asciidoc-9.0.4.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/asciidoc/asciidoc-9.0.5.ebuild b/app-text/asciidoc/asciidoc-9.0.5.ebuild
new file mode 100644
index 000000000000..3b4cdbf3dd7c
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-9.0.5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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 ~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/cmark/Manifest b/app-text/cmark/Manifest
index ff1a20a0f9b4..a5a20ee774dc 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,4 @@
+AUX cmark-0.29.0-python38_tests.patch 1136 BLAKE2B 788a0022fb2d2575ea18133f57863cd8c12958b4fb6f79ea8611c6358ed66531a3b923e9959ff2b29348a2506f5ad7b0fb7a5b4402cb299feb1c6939e1160a62 SHA512 bb07e53f4ead6022863edb738986761a1e7b5184737265166fcee9f9bc00124c71eb49643bcb4ea9d0634c08f1c1ca3916e3a4c76b0f801dd011a184bdc0f39e
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-EBUILD cmark-0.29.0.ebuild 733 BLAKE2B 368a62d668bad1850d17989fe30d70b9f397d84fb130a9d79a6de63b04f6fbc17eaae99d059ae518e72f96ffb9974b90334dd4c7307dca3e4dde21d89ee1d8de SHA512 3bf8ad975aa548c7fa2fb2e5791af117e8d09d9b5aec53bd698a478520404556f8455b35c613f811ca319bc536aed30a24fc3f9e9671b342196c995f8823f26e
+EBUILD cmark-0.29.0.ebuild 787 BLAKE2B 027d8eb0f2f1250a6af14bf310ab2cb1a1cfb95550dbdd93205d718b98d80dc32713cb0c81c827b3af4fe37e123bb68681dd1b111c0304a6a3052c732b01920e SHA512 b22bddd41344a49b331f3ba1ed7a8ac2d5f38bdf5d89916a5576363ca89bd58c456bd0ecbfa9e50bfac9a4ab37883f9a0ddcd70416f18a4e7284e2c2c9f0d902
 MISC metadata.xml 473 BLAKE2B 770f8d92e6aa0ff167733de2877fe1b244cd153875dce9116b361cdb4ee529e54de01f0841af1d1a23b54826786e784097afa993f791515a79c4a1af61b4349a SHA512 a0f0f24ee085d6d49311c08a1cb72f492cb88659a840ffdc2d01576c97b9a56b63beab6fe46a23df5331ce2fc100341283b2cf0bdb18a3861f0953f8c1331c72
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
index 36fc6e99005e..a1db9210003d 100644
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ b/app-text/cmark/cmark-0.29.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,6 +19,10 @@ RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-python38_tests.patch"
+)
+
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
diff --git a/app-text/cmark/files/cmark-0.29.0-python38_tests.patch b/app-text/cmark/files/cmark-0.29.0-python38_tests.patch
new file mode 100644
index 000000000000..13cd71815941
--- /dev/null
+++ b/app-text/cmark/files/cmark-0.29.0-python38_tests.patch
@@ -0,0 +1,31 @@
+From 92697d564042d5b914048e087e4274c3c71e0055 Mon Sep 17 00:00:00 2001
+From: Christopher Fujino <christopherfujino@gmail.com>
+Date: Sun, 12 Jul 2020 16:11:42 -0700
+Subject: [PATCH] replace cgi.escape with html.escape (#656)
+
+---
+ test/normalize.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/normalize.py b/test/normalize.py
+index 6073bf01..f8ece18d 100644
+--- a/test/normalize.py
++++ b/test/normalize.py
+@@ -13,7 +13,7 @@ class HTMLParseError(Exception):
+ from html.entities import name2codepoint
+ import sys
+ import re
+-import cgi
++import html
+ 
+ # Normalization code, adapted from
+ # https://github.com/karlcow/markdown-testsuite/
+@@ -66,7 +66,7 @@ def handle_starttag(self, tag, attrs):
+                     self.output += ("=" + '"' +
+                             urllib.quote(urllib.unquote(v), safe='/') + '"')
+                 elif v != None:
+-                    self.output += ("=" + '"' + cgi.escape(v,quote=True) + '"')
++                    self.output += ("=" + '"' + html.escape(v,quote=True) + '"')
+         self.output += ">"
+         self.last_tag = tag
+         self.last = "starttag"
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 0c76bcf9842d..ea43762f7841 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,7 +1,9 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
 DIST coolreader-3.2.50.tar.gz 21252394 BLAKE2B 68550656c644d623e24a7da310baf77881c72621db03f481eeaaceddc0a3c77ecd4d2098c4afe0b56fc50a67f471a9a6a20c172590365bd888222894d27c1826 SHA512 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3
 DIST coolreader-3.2.51.tar.gz 21575605 BLAKE2B dcd0b33706d675d0da46825b298b726c6c4ef041989b74619fb289ffefa3f62284d22d8ab0930f2866b1b01ae92f2acb8efe51fc8230d925454ed351b9c30242 SHA512 e7e4645c501c4999dd4a3069d3b11a634eca285da23c113bb9fe339ba9b519de994f972fcd65cf941ab6ec326a234af91ae7728689e3afe3f00ad2e93c08c279
+DIST coolreader-3.2.53.tar.gz 12550563 BLAKE2B 24543cac98349f4c0587149a3eb8f964cfb46891a0ed7c613a4a0bd644e8d24cb0ff057eab74aecf3c574e604d4208dbbee4c7023d8197282589184317312ee3 SHA512 4f500d877287b3c391cb0be7038586897e7c0eb9cfbe87d9b3ee3923db82c4ce04533249dee83a259a084bc142236cc5cc67f3e4428f05756da8c593a47a9558
 EBUILD coolreader-3.2.2.1-r2.ebuild 2475 BLAKE2B ef04a9149a2ca2b02b82de190fe071aeaa7f3880dfac03f39e4b20d1c408f55114048ec20479bcfc2ae92f396520a583a940f16afe09f3d53418b65ab25169dd SHA512 280a8eaddbb44e09ce50cc02c26f9a07f34ca986d30c79f3b2100c14a73fa63f0970cdf1436dc4f496191cbd423fa5bd8d7afd34e201f938caab0741ed9b54d2
 EBUILD coolreader-3.2.50.ebuild 2450 BLAKE2B 94b8e8cbfaee42fca275ba15fe910e0feb5962f3f1b5a5388e4e45281d7089300904dcda2e38085fb9510b1535320d4e260c63e9480eba5bf0f1e0b87747159c SHA512 2ce5d70774b33bf61efb62ce5546210b07521709e55da040d849fc4d84b225dae16148b6f30aa199c7d991675a33ce94627af77a128d37d4e2bf100821119d80
 EBUILD coolreader-3.2.51.ebuild 1756 BLAKE2B 249d73cd0c5754eed0083e3b33836620be1ec53aeda9cd83100ad119ef8093369190dfd6765cd0cd615c5fa27cc1d69d37cdf22effbc728232c4209135e33f00 SHA512 2ab5f9f9e6e4f9a440cb81d52208d4399879558d7bb41e4310ad35401dd850e99d8abf525370c960f4bc0b91258ab789f14c130488c7aa9eb136ee6517aa37f3
+EBUILD coolreader-3.2.53.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.53.ebuild b/app-text/coolreader/coolreader-3.2.53.ebuild
new file mode 100644
index 000000000000..7c75f5c7adcc
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.53.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake wxwidgets l10n xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	dev-libs/fribidi
+	media-libs/fontconfig
+	media-libs/harfbuzz
+	dev-libs/libunibreak
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(l10n_get_locales))|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if ! use wxwidgets; then
+		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
diff --git a/app-text/cuneiform/Manifest b/app-text/cuneiform/Manifest
index c288df96bdce..3aa5bbeee7b4 100644
--- a/app-text/cuneiform/Manifest
+++ b/app-text/cuneiform/Manifest
@@ -1,12 +1,12 @@
-AUX c-assert.diff 2053 BLAKE2B c5c4d36156534400ded8b4f665f822ba561d5eaddcb0d2b821d5eff52645b28e92422b18a012c83469104ddeab14909bf383ceac3ba77ba11a4c2e12340d5b40 SHA512 f330005441e0b9abefa97f0dfe46dcbf1c4471185417408e81b87c5b5332db49355fbeb2e5bb4d75f4f0ff79a0e8c60228de12776187c0fdb3bcc67370ec040f
-AUX cuneiform-1.1.0-fix_buffer_overflow.patch 1128 BLAKE2B 0b70a1ffa36a74171c817056f8833ce7d9bc2e68115cb3813cd1984e454dab6a99117977b371890cbe87b2f79a22fde286257b0bdfa4372534f3ed8fa1add6ae SHA512 5db3f9d7e483e2dd0eda83b3e26090743b5188e3ae6bb8a33496a0b9e228b4484081708bdfe41653b9051d7fc0decab90555a6a4f0e1392169251a2e7488b772
-AUX cuneiform-1.1.0-fix_buffer_overflow_2.patch 933 BLAKE2B 65f4ed379506882abfe886036d8aba52c7da20ce8a874fc99f725262a91a16c1594e40bc6210e06950f476305d53e3e25a5dff748581c201ed3971a02045ca39 SHA512 0642ba193e1e1a6b6264218aa55edc261baeb5d4f43eeba0114a46f539041fdb54aba26f11f1ff42ee97cc885a2f58dfa8d6c727a9da83374717b8bd08209d95
-AUX cuneiform-1.1.0-gcc6.patch 6081 BLAKE2B c2f11845aae2d07d94f985a474621b3f1d8b6c1d9e437d5eac948394e5540c8b4b03053ae46f07cda3ba16401f16589a0210ff050e6cb9a2b9c7431b55f0f65d SHA512 a061118133b6baaaf691a273b6d8e543d2dc250a2a132a800ad926f0a22916dce8d712400d8c8c65829ae373cc9aab5a4c89e73a0606e4399817aca91463bffa
-AUX cuneiform-1.1.0-gcc7.patch 3978 BLAKE2B e2e70bf7d878393cdd6be4f81983a089a6e3d66517be16ef23c530eab09068307f2b17fc5762b420708b3fe8c173cf8d331fc11a62cf6f9bdd0e2232f4731c08 SHA512 feff7586552debe13a6d8a7709d9e42724444eec0654d2430ff7e88cf1e614b1f8678beba4b6962162bc83a7ffd09ace4818df8753d703c90a8c68627568986a
-AUX cuneiform-1.1.0-typos.patch 1758 BLAKE2B 85e31589d6d02ecfdddc9c4134624164275d5392b4db2dabd881cebf35cd833fba49053f2f1e6ee732bb4727836549e25c3179669de6957cf52aa252fb8d4987 SHA512 36f5aef2a20b0d1411dbe2c53af854fae7cc2a41b90bb1de5fe37fb2de74e2f23c16f7c358620e9ac5173285a8752cd7f2db4d580ac9baf20b9fff37fb86d231
+AUX cuneiform-1.1.0-c-assert.patch 2012 BLAKE2B e1c71e4b1be912ce604b43b1b09f96b299d9cb7dd553ed818203a2c06f7227e2c140095064accab3f90a32b16948276abd05e3451aaef1e3f66d87e219828424 SHA512 8c05e27e425c5221e6bb47eb8655e21e9f4ecd311679cd1b80a04e255371ffc907a9bca3337e78af6c88f23a3c6cf474971e1e94b6c6f1d30f206d01fb9a3a95
+AUX cuneiform-1.1.0-fix_buffer_overflow.patch 1089 BLAKE2B df9be625fee6806634c56fabe2ea27d0e3457b5c5090a7ff20aad79827fa7e6c25382cc0a230c31c4da3987eaba88de3628adedf2286ca317820134b04980134 SHA512 b701573177788575c540bb2203dab4d3f7ccc150bb71a53a13ac61971b357a4bfa67764f9880fd042798a94d79b70bff85c13b8e6005be344eb51c1bcd9311ab
+AUX cuneiform-1.1.0-fix_buffer_overflow_2.patch 888 BLAKE2B 9185e7190120138cdc0fc943b41878b9036cfedcb71fe47910b6f2c41e2865915570501a20d512c7ca0cacc09ece9e9cf688dc0d57963e76f1e923545fabc9f6 SHA512 182e1756adcbb71bd052fef7caf9b638b448bf995e2a6d2d5646737d22cacedf90840fbabc84e580450e92cb08ae357ff862aab977b8e34459dcc479fb92a292
+AUX cuneiform-1.1.0-gcc6.patch 6080 BLAKE2B c9cf22db876320005c78f5b96330a11782d2d521fd1dd3024345f61bebb7a7d357c280d30d71193a5f94fee7cdd934351ced1f2073bf69047e8a090bbce66818 SHA512 277cc973a1934d7f722e7a3e30c981cbe57cf268b1553f3f552e15eebcf4c191c7457a8f8c3562f7fb1629b3405c37b10298293c047b8d3b0e67bb0cf72462f4
+AUX cuneiform-1.1.0-gcc7.patch 2814 BLAKE2B fef51b014790b27acd042b5e46e1ff79111a983b869d9591ed16cdbaa36139748987d5b3c91e5dfcac77b1495edb6ccb93ce4e922b8eb1fb49da22d6ea789e9b SHA512 4b164868c4612c28f0f1460ec4fb417a015840705e5fe5aa44c6ee2e350506fe1f7a7cb8f24e29f54b449c2893ff83bbdafd7df8733154bf8759c89e67902088
+AUX cuneiform-1.1.0-graphicsmagick.patch 1500 BLAKE2B 36a9e1292bc889596468f96aa6e515fba1368d9f6f451e3b0f2d51e91032a3093d74fa6496f1360385d1f18a39159a3eaf055e4b748520ac7b7767bdee13b47a SHA512 c3cbd03fd93c172d0b02a49c7f470348f60a46e09413872aefd7e581ac4934e41a75210afefb93f83b28cf2733dd0d025b1198ce6e28a9b950e54097adf33af3
+AUX cuneiform-1.1.0-libm.patch 595 BLAKE2B 7c9bba013f4e3560149eb05504ebb9f600aba8dfcb225be435ad5ba0ce0d2f0aa87835c370977deccce53a1618c5656b484de9f3724a2d15c946812909ec3837 SHA512 ea7468fdb4a0ac4195d9b48bbac43e8854310982118d66a3b829fcda4a912ab47220c68eb7da07dd98f8db8f3b8209d45c1d0dbc7da77c933fadf91b6d350846
+AUX cuneiform-1.1.0-typos.patch 1757 BLAKE2B b02ad10370a7bfed3201905c3282f5419e05845382084d70d4ce531722098bc1e225b3cb2bc6f6bd9978bea17903a9c2837e093b78935a5ddf1f05e29598b280 SHA512 5b8a1151b85cd2d5e0672b4ca125500047365051c9171bad49354d6e064d1fbe59631aa088183b9b0a3c9859b297cfc61055ab2f0fbfc3df669d3d6fa91ee4ce
 AUX cuneiform.1 2844 BLAKE2B ed7d68de70ebd50caf35bb22ebd23ef7ecf00633be22f237e19830456c1efe83a6c546dd27dcf776e91bdb9189236b48690cdf2b172602e2a0528c12de9b1532 SHA512 55dfaa6fd759a24c1a49ed1455a6f04e63c40f048872bc8309b770942747006bb5ed4704171a53490552c4170471934dcaeeb692921ebbc020f012f84afc6d77
-AUX graphicsmagick.diff 1547 BLAKE2B 5dad602a467a2b3f8c0a55f8a873e9d46cde7857b078009888cf965440ad9a863a5cf3cdb5a3df8c42cf4cc33a4ada7d029c4a80e741083fe54f9948ff837832 SHA512 1aec9b28b1fdde076a4eb3b9d03c448ed28dfdfe102d0fcb7dd9c75c3dd735854ca69d0334c0b1067fa897cfd96044cc49cdf7c8b90e464fa653b702a946fad6
-AUX libm.diff 634 BLAKE2B a1f3eaba778b5cb1a8322a3b3c048293af61eebfe1c3e43c880242a100b732d3f2252ea9bac3469218e0f6e97424fd13ba52655adaf1a43b8c8abf8d67652e16 SHA512 7b1f00e9644ef0762adb10d64835bd9f2e5b2d64729a75cd1afde62f6560afe4fb632e666a4f971686aabbc8a6d5d6364ab641787a01152667e25904fedfff62
 DIST cuneiform-linux-1.1.0.tar.bz2 26388511 BLAKE2B 9a9406d42b96d814b7342c48b384b7d46b529116e37f9946da6b1158bd223d2e4be0158bd0101f0b9821b7d63374758190e60232483779bdb6a4164d1b06034e SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56
-EBUILD cuneiform-1.1.0-r3.ebuild 1528 BLAKE2B 40cb06b092624ded0880885fa36e0a5737bf10b59727be792c2852d6e4ab07f66860425b3a337735ed9822c8e90bfbf8d4fc995bce828044e77e71a1da5b5e1c SHA512 a2a4106a360b2b888aea93df82ae3f134b7ed4df6eeb98fcaf35fde5ba6f288c4267cd2fb31dca2bf0ecd50026996ba28be439bbdfd2d6916f665ac950a3a23c
+EBUILD cuneiform-1.1.0-r3.ebuild 1497 BLAKE2B fecbe9b8d7be47d2cabdc42de3bd65d41525139054f7d018a7de23638514ee0ebce597958ec7b22761276bed2022179a4153670950126ec34800cdb2bb87a631 SHA512 41aedb8f002c8409be220667a1b737f65860bd324f387c963cc05698a80ffcf8022c0e129397448eab1a1ada1f2cc560075e22ea064224c3e9c8ee342b9ee949
 MISC metadata.xml 250 BLAKE2B a79213869bd5899b9cfe177caee01e12a026f71485466cf3836d2809234fb64fe5c7ca8d945765fb2f40259fb0a9817e521d101d29ae87cd34098d5316f3dcba SHA512 b540aad05003ebec6a4f52250febbca55356d3d2d826d7b3f982d25ca543be928537194325600b5489970288e6500a671b0343735ed9ee052471efa26cd7cdab
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
index 53d1efd18b7b..3874e69f95e6 100644
--- a/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
+++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils versionator
+inherit cmake flag-o-matic
 
-PV_MAJ=$(get_version_component_range 1-2)
+PV_MAJ=$(ver_cut 1-2)
 MY_P=${PN}-linux-${PV}
 
 DESCRIPTION="An enterprise quality OCR engine by Cognitive Technologies"
@@ -15,7 +15,6 @@ SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE="debug graphicsmagick"
 
 RDEPEND="
@@ -25,21 +24,20 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-DOCS=( readme.txt )
 PATCHES=(
 	# From Fedora
-	"${FILESDIR}/c-assert.diff"
-	"${FILESDIR}/libm.diff"
-	"${FILESDIR}/${P}-fix_buffer_overflow.patch"
-	"${FILESDIR}/${P}-fix_buffer_overflow_2.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-gcc7.patch"
-	"${FILESDIR}/${P}-typos.patch"
+	"${FILESDIR}"/${P}-c-assert.patch
+	"${FILESDIR}"/${P}-libm.patch
+	"${FILESDIR}"/${P}-fix_buffer_overflow.patch
+	"${FILESDIR}"/${P}-fix_buffer_overflow_2.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-typos.patch
 )
 
 src_prepare() {
-	use graphicsmagick && PATCHES+=( "${FILESDIR}/graphicsmagick.diff" )
-	cmake-utils_src_prepare
+	use graphicsmagick && PATCHES+=( "${FILESDIR}"/${P}-graphicsmagick.patch )
+	cmake_src_prepare
 
 	# respect LDFLAGS
 	sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' \
@@ -48,12 +46,16 @@ src_prepare() {
 	# Fix automagic dependencies / linking
 	if use graphicsmagick; then
 		sed -i "s:find_package(ImageMagick COMPONENTS Magick++):#DONOTFIND:" \
-			cuneiform_src/CMakeLists.txt \
-			|| die "Sed for ImageMagick automagic dependency failed."
+			cuneiform_src/CMakeLists.txt || die
 	fi
 }
 
+src_configure() {
+	append-flags -fcommon
+	cmake_src_configure
+}
+
 src_install() {
-	cmake-utils_src_install
-	doman "${FILESDIR}/${PN}.1"
+	cmake_src_install
+	doman "${FILESDIR}"/${PN}.1
 }
diff --git a/app-text/cuneiform/files/c-assert.diff b/app-text/cuneiform/files/cuneiform-1.1.0-c-assert.patch
index 0abf1b117343..5241960f8405 100644
--- a/app-text/cuneiform/files/c-assert.diff
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-c-assert.patch
@@ -1,9 +1,5 @@
-Description: Use the standard C assert() macro, rather than custom Cuneiform
-  one.
+Description: Use the standard C assert() macro, rather than custom Cuneiform one.
 Author: Jakub Wilk <jwilk@debian.org>
-Forwarded: no
-Last-Update: 2011-04-30
-
 --- a/cuneiform_src/Kern/lns32/src/myassert.h
 +++ b/cuneiform_src/Kern/lns32/src/myassert.h
 @@ -60,6 +60,8 @@
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch
index 8e9811540cd6..15454e6e6916 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch
@@ -1,8 +1,5 @@
 Description: Fix buffer overflow during crash when using user supplied image.
 Author: Sławomir Nizio
-Forwarded: no
-Last-Update: 2017-04-05
-
 --- a/cuneiform_src/Kern/rstr/src/acc_tabs.c	
 +++ b/cuneiform_src/Kern/rstr/src/acc_tabs.c	
 @@ -1233,7 +1233,7 @@ if(is_cen_language(language))
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch
index c64b42fc8933..2057aa584dea 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch
@@ -1,10 +1,7 @@
-Description: Split original patch by Slawomir and update the same to apply
-neatly.
+Description: Split original patch by Slawomir and update the same to apply neatly.
 Author: Bhavani Shankar <bhavi@ubuntu.com>
-
-
---- cuneiform-1.1.0+dfsg.orig/cuneiform_src/Kern/rstr/src/acc_tabs.c
-+++ cuneiform-1.1.0+dfsg/cuneiform_src/Kern/rstr/src/acc_tabs.c
+--- a/cuneiform_src/Kern/rstr/src/acc_tabs.c
++++ b/cuneiform_src/Kern/rstr/src/acc_tabs.c
 @@ -2821,8 +2821,8 @@ if( CodePages[language]==CSTR_EASTEUROPE
      strcpy(decode_ASCII_to_[(uchar)liga_j      ],   "_j_");
      strcpy(decode_ASCII_to_[(uchar)liga_exm    ],   "_!_");
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch
index e45768e90f29..5e7b6d80df05 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch
@@ -1,6 +1,5 @@
 Description: fix FTBFS with GCC 6
 Author: Andreas Beckmann <anbe@debian.org>
-
 --- a/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
 +++ b/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
 @@ -594,8 +594,8 @@ Bool32 CRIControl::CreateDestinatonDIB(u
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch
index 01530ab4b1d3..25fb846924ed 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch
@@ -1,6 +1,5 @@
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h cuneiform-1.1.0-char/cuneiform_src/Kern/hhh/tigerh/h/strings.h
---- cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h	2017-11-30 11:25:24.409125695 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/hhh/tigerh/h/strings.h	2017-11-30 12:09:26.033501963 +0700
+--- a/cuneiform_src/Kern/hhh/tigerh/h/strings.h
++++ b/cuneiform_src/Kern/hhh/tigerh/h/strings.h
 @@ -80,6 +80,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  
  # include "ltconfig.h"
@@ -9,9 +8,8 @@ diff -urp cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h cuneiform-1.
  
  struct _String;
  typedef struct _String STRING;
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/include/utf8-tables.h cuneiform-1.1.0-char/cuneiform_src/Kern/include/utf8-tables.h
---- cuneiform-1.1.0/cuneiform_src/Kern/include/utf8-tables.h	2017-11-30 11:25:24.410125673 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/include/utf8-tables.h	2017-11-30 11:32:05.974413875 +0700
+--- a/cuneiform_src/Kern/include/utf8-tables.h
++++ b/cuneiform_src/Kern/include/utf8-tables.h
 @@ -68,7 +68,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  #endif
  
@@ -57,9 +55,8 @@ diff -urp cuneiform-1.1.0/cuneiform_src/Kern/include/utf8-tables.h cuneiform-1.1
    {0, 0, 0, 0},
    {1, 0, 0, 0},
    {2, 0, 0, 0},
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/codetables.cpp
---- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp	2017-11-30 11:25:24.411125651 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/codetables.cpp	2017-11-30 11:47:51.856189912 +0700
+--- a/cuneiform_src/Kern/rout/src/codetables.cpp
++++ b/cuneiform_src/Kern/rout/src/codetables.cpp
 @@ -937,13 +937,13 @@ CP_TO_CP tab[] = {
   * codepage.
   */
@@ -76,9 +73,8 @@ diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp cuneiform-1
 +  default : return (const unsigned char *) "?";
    }
  }
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/rout_own.h cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/rout_own.h
---- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/rout_own.h	2017-11-30 11:25:24.411125651 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/rout_own.h	2017-11-30 11:40:01.457220419 +0700
+--- a/cuneiform_src/Kern/rout/src/rout_own.h
++++ b/cuneiform_src/Kern/rout/src/rout_own.h
 @@ -458,7 +458,7 @@ Bool SetTableTextSeparators(char* s);
  void ResetCodeTables();
  Bool UpdateActiveCodeTable();
@@ -88,9 +84,8 @@ diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/rout_own.h cuneiform-1.1.0
  
  //*****************************************************************
  // Rout.cpp
-diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/text.cpp cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/text.cpp
---- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/text.cpp	2017-11-30 11:25:24.411125651 +0700
-+++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/text.cpp	2017-11-30 11:40:43.571320319 +0700
+--- a/cuneiform_src/Kern/rout/src/text.cpp
++++ b/cuneiform_src/Kern/rout/src/text.cpp
 @@ -310,7 +310,7 @@ Bool OneChar(Handle charHandle)
  				*gMemCur++ = c2;
  		}
diff --git a/app-text/cuneiform/files/graphicsmagick.diff b/app-text/cuneiform/files/cuneiform-1.1.0-graphicsmagick.patch
index 265190f40c8a..ae1d8242b1fa 100644
--- a/app-text/cuneiform/files/graphicsmagick.diff
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-graphicsmagick.patch
@@ -1,8 +1,5 @@
 Description: Use GraphicsMagick instead of ImageMagick.
 Author: Jakub Wilk <jwilk@debian.org>
-Forwarded: not-needed
-Last-Update: 2011-01-21
-
 --- a/cuneiform_src/cli/cuneiform-cli.cpp
 +++ b/cuneiform_src/cli/cuneiform-cli.cpp
 @@ -341,6 +341,10 @@
diff --git a/app-text/cuneiform/files/libm.diff b/app-text/cuneiform/files/cuneiform-1.1.0-libm.patch
index 0ab16d58274f..88347abbb04d 100644
--- a/app-text/cuneiform/files/libm.diff
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-libm.patch
@@ -1,8 +1,5 @@
 Description: Link the leo and r35 libraries with libm.
 Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>, Jakub Wilk <jwilk@debian.org>
-Forwarded: no
-Last-Update: 2011-07-04
-
 --- a/cuneiform_src/Kern/leo/CMakeLists.txt
 +++ b/cuneiform_src/Kern/leo/CMakeLists.txt
 @@ -23,6 +23,7 @@
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch b/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch
index 3439760d79d8..3e5fcf21c8d2 100644
--- a/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch
@@ -1,6 +1,5 @@
 Description: fix typos
 Author: Andreas Beckmann <anbe@debian.org>
-
 --- a/cuneiform_src/Kern/rblock/sources/c/ltmain.c
 +++ b/cuneiform_src/Kern/rblock/sources/c/ltmain.c
 @@ -344,7 +344,7 @@ i=0; i=i;
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index e86a84bcbe89..d61847c71e20 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -4,6 +4,6 @@ AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63
 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
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
-EBUILD dblatex-0.3.11-r1.ebuild 1794 BLAKE2B ad1b02cfd02ffae9f03716f866d116c51f2bcce04f5ff4e698e50ca42780fa2ae5ab17aeb0b4522afd3e250fb1a2f7b09c94484644d7fca15f4982018fc4f94a SHA512 c5973f654e73dd99422c01bd7d3c893c109335e4874550eee275a0e4ff11dbc1390c94e80b25db5dae76faed1f74e50402aa66350358602a36015b3df0870cad
+EBUILD dblatex-0.3.11-r1.ebuild 1814 BLAKE2B 05bb33b428ce07f633428183336ce173ea4c41977803eb356042a750dc6a6f4cdfa6efb82a7119ec9488f7d8d4b0445ef7731df7231935995a1ca46995ac6971 SHA512 eecf1f580dc811a573f48d2b0c45898eac04ccf2de1429cb1b0fd272e68125c01296c4ea40180f9085851254c3b6b06dec06ce0a40bb10fb3459aa018c3eeab5
 EBUILD dblatex-0.3.11.ebuild 1618 BLAKE2B 427f03056dfe0ac8d2b8f80b046c76b5aa0110f85d49ac07bcca8978df94d122f5996d0d02d485af58bd9b031351ca58e6bb688bd166ee7030005166669967fe SHA512 35471efbc664a9002296d8ed5dd1644c246056ed6a1adc40932da3cce05211b7e9917f357902d5c9420e74d87b6fb3910f3257ef6b6baae6009a58880b826032
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
index f40eefff3146..19c45bd966b6 100644
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~ia64 ~ppc64 ~sparc x86"
 IUSE="inkscape"
 
 RDEPEND="
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index 3923ef1e31de..0267f73e534d 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,5 +1,6 @@
+AUX diff-pdf-0.4.1-no-poppler-cairo-check.patch 798 BLAKE2B f3932e5e7babd37b0df89f37536b91eee4978b3ac34b8c9e628f0db3f2d0a617f872b137cabc257e6cf470d6b80aade4c835e91310ec84b296d46d24c457f5f3 SHA512 2f4c399e482ace0e00995a732f0489d8b614e31396ed6279b0399e8c009b228386319a611ee52b784ba2313561e7aef27ae5b9090d3fb78fa09660992d483cc8
 DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
 DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
 EBUILD diff-pdf-0.3.ebuild 1289 BLAKE2B 3eef9f78e56f7f0da662a8ad3fb75e8b5683d58c3dcdc6d4df426d78814b834afec798b0189bf22c65da304d5ccfea1afd324d7f066536f0b162f89715af6596 SHA512 5f667ed5f3391c1fd6bbf426d7947b50e5c75ae0aab61dbe20c1c6efd3710b18d9d2a8c1407e657219db6a58b9450542eacd52bbd382361ba7341d99b00ada23
-EBUILD diff-pdf-0.4.1.ebuild 1290 BLAKE2B 6f960173b5b8fc9a853a47fcc356008f2e98e8a3112a4dae7cb71c381fbb2bc2040212e821c668ea31633b14d83d0e93b54ff80c49c4616aed4416e7fdfd9c24 SHA512 85a2da6028e118be3eabc04f7580bf94a6a164d534fc409262f451fff80fe6ecd7a54b1ae7a15eb7bd60c49873014d9a85cf8cd1a5550a01ec559f0f6f9b7bf6
+EBUILD diff-pdf-0.4.1-r2.ebuild 1412 BLAKE2B c8b69c608f797be990cd7ff2bba3d8394efe6a9fcf0824e386d78a65194f37db2002a33f85316dea65263083d6990201a94b32717b0678b98a64c4657d332546 SHA512 bbbf7c920ce7663f518c8f0517c022a58e1d7d2632312d89c9356fb8dc855a4fbc77c98fb766fc2ac2775fddeedee3a1e34e413ee97b34338f52a2d86150b361
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
index 5b18231db4e7..992e9b377978 100644
--- a/app-text/diff-pdf/diff-pdf-0.4.1.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # No EAPI=7 support in wxwidgets.eclass.
-EAPI=6
+EAPI=7
 
-inherit wxwidgets
+inherit autotools wxwidgets
 
 DESCRIPTION="A simple tool for visually comparing two PDF files"
 HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
@@ -29,11 +29,18 @@ IUSE=""
 DEPEND="app-text/poppler[cairo]
 	dev-libs/glib
 	x11-libs/cairo
-	x11-libs/wxGTK:3.0[X]"
+	x11-libs/wxGTK:3.0-gtk3[X]"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	WX_GTK_VER="3.0"
+	WX_GTK_VER="3.0-gtk3"
 	setup-wxwidgets
 	default
 }
diff --git a/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
new file mode 100644
index 000000000000..ecef020a998a
--- /dev/null
+++ b/app-text/diff-pdf/files/diff-pdf-0.4.1-no-poppler-cairo-check.patch
@@ -0,0 +1,24 @@
+From 00fd9ab8bf435658616f3f25b18d51b0a7ee5769 Mon Sep 17 00:00:00 2001
+From: FX Coudert <fxcoudert@gmail.com>
+Date: Sat, 12 Dec 2020 16:18:59 +0100
+Subject: [PATCH] Remove legacy poppler-cairo dependency (#69)
+
+poppler-glib already depended on it, so this is non-breaking,
+and it is removed in poppler 0.18.1.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 382e220..2e9b6e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,7 +41,7 @@ AC_LANG(C++)
+ dnl === Library checks ===
+ 
+ PKG_CHECK_MODULES(POPPLER,
+-                  [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf])
++                  [poppler-glib >= 0.10 cairo-pdf])
+ 
+ AM_OPTIONS_WXCONFIG
+ AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base])
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index e5643efd2401..b01f609f0f4f 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,5 +1,5 @@
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
 EBUILD djvu-3.5.27-r2.ebuild 1660 BLAKE2B ed005e78e907b2caf89118c2e37448a0951b08db834004f480e644534bf337b5dfa6220697dbf8b07f80f651afcfc6bccabe826242eefb6e05432040582ab981 SHA512 c6d5b6e7997fb7d8ab9ab688c3679ca150d92d2a6c787c63001780a30e51de630fec300911979803c4556e4186096ca4600eb0e2b67a3daa6cc8e1033791063c
-EBUILD djvu-3.5.28.ebuild 1529 BLAKE2B 9f08ed62a5891e67f3f59ce97cebe5986ea96b6f353cdd6b5486c69b777be1f26a47a2c42f493b186003087a958b7d7b05a0b7e4a60e6128140fd5be56274ede SHA512 55cd0ef43614ab979be16704fb15d7e277b04e6ffec7c6e8af82aee48495c5d5d029e090bde1ae0d391124dc3624da71dd67c570acbb6114ccf8b0355d1422c6
+EBUILD djvu-3.5.28.ebuild 1524 BLAKE2B 035be57e17a4f9e27afb7e74114a96fff018ba22ebcccb0da357fe096abac6fc9d953a1ea877f5adb4cd8e843b61269b3f59dddb8c7fee7e95e1ace72de6b954 SHA512 e139a758eddf478e35225338bee012f357992feaab45f3297cda715f76daaf90ecdfc03cdb3ec98735688f6715293fa53d1a2eb1b112d358eec189dd62ece97b
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.28.ebuild b/app-text/djvu/djvu-3.5.28.ebuild
index 4c1572488ac4..641b140a23f4 100644
--- a/app-text/djvu/djvu-3.5.28.ebuild
+++ b/app-text/djvu/djvu-3.5.28.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P%%.3}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index a86fee496b13..1bb55b092eee 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -17,7 +17,7 @@ DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b48
 EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1238 BLAKE2B 87a26f4bc28de4d728d8a2bcd066e62b1e72e6cf6579e48999bd6102d9c38491d9ea587ead966fc7126a0c44b34daacb78b2657c7f74985d7f1a36578c63a26c SHA512 926a260a31195368606bdcee7cc37751aea546c67ebe5f1aed6eab015b44ea474090b961665d3e5c1c05ad879da1524597bb3768c52531a918dbd21b75dea502
 EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1238 BLAKE2B 87a26f4bc28de4d728d8a2bcd066e62b1e72e6cf6579e48999bd6102d9c38491d9ea587ead966fc7126a0c44b34daacb78b2657c7f74985d7f1a36578c63a26c SHA512 926a260a31195368606bdcee7cc37751aea546c67ebe5f1aed6eab015b44ea474090b961665d3e5c1c05ad879da1524597bb3768c52531a918dbd21b75dea502
 EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1231 BLAKE2B ddf85c9ab16c48026ccf0bfd652d8839b5bdbc2d957b76522b58a7ff75ea325e4b3211a954326339b0fe1d1da01b6cb54ebe2e9a064fd54ec95e1bb80b0607e0 SHA512 a5050fd247a2f93e4f0296ffe842342afc2b7d062825df6fdc22245f44f0f6b02c163f121745123fe048f7bdef222dab3a6f3f82e7fb3dfdd76b2242e697932e
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1231 BLAKE2B ddf85c9ab16c48026ccf0bfd652d8839b5bdbc2d957b76522b58a7ff75ea325e4b3211a954326339b0fe1d1da01b6cb54ebe2e9a064fd54ec95e1bb80b0607e0 SHA512 a5050fd247a2f93e4f0296ffe842342afc2b7d062825df6fdc22245f44f0f6b02c163f121745123fe048f7bdef222dab3a6f3f82e7fb3dfdd76b2242e697932e
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1272 BLAKE2B 77a66f4296ccae649a22dbce1b804c8025c0b2557d4632c71677a5a7a23007ae98df513b0d6b0841279f60c05589ce4f99508eec7eccd01078ea8660be7d0eb1 SHA512 8fbfef320c3e5760e774dd8788c5f400b3b6412a31730d22a8a7c135e3500aa303eebc7a2dba9fbd6758b610f956d7b675dc37e90f6d4c2ddfdb1d0434058ccf
 EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1242 BLAKE2B ad1d5bb8cfe599fc2532f42312e94f278fd47aab93caae99cdea0135bdbc940b03953c8f5f8643516db90dfb6fa158b05c8db9b2fa324f93c5c58c04b3800a19 SHA512 c85ce5031aac0c6ab02363f43aaacd9233c8b77c4a0945692aeb01c238b2d00abbbcf3acdfe1c69ddce8af5187740ef2a248088d0b0e395de1e9d122ebd65061
 EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1227 BLAKE2B 9fde28427fe6bd0682f12e67b0e13e9e2374f1d2520a917da1cf63ac2686546f835509f9d833f786b50561f256aa432bf7d0ec2e403552ecfead8e176d3cf22e SHA512 f99b46a247b75632ede4e7b60e39bace80019458285579b34c1fefe877e7ebb1b7cf09304e819d8e7d134bdb07a38fc881aab1362a976a14c009b8d457c8afd3
 EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1227 BLAKE2B c83633234f8ed449837093e831161c39346613159174c4bcb573602cbd1a50914046d982fa274e44b02280093c124f1b1ab41a67478d6aadcae36a4b9eefa3e5 SHA512 3954b4358b46ec6c09c70f49db9efd44988420f93f01ac2a03655e64be090c57cd3ce43e4bf3b4178f053f60dec13281999308ff763dc9f0f61937dfc411cfe5
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 8f58b7ab5143..de80f946e64e 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-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 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index 398b2d47b2c4..8b3c8eb29758 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -1,7 +1,7 @@
-AUX docbook2X-0.8.8-drop-htmldir.patch 327 BLAKE2B 052e6e19a639182c8fb04ddfbde371ec0e154ee9049d97827fa6b65db7e745aefc65c3a49f5c8e49f710abfdabc88784a256535d0f2c0c203990e4999b32a7a7 SHA512 c8e3cbbf1f18aeb5489d12f8fd661c38adae7e60ef3861135ff0aa3c515cc509ecc9ae19ace81e94cd181dac15b08bbb4783b39bd96674bdc83abc95aac5ddcc
-AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c63ce5828d5a2d450cafd9989af98f99e2aab89c940074105806d85156acadc1b3ea35aee159956da4e7d3d22c6e2bbc10f3bed899b76787db8 SHA512 ea9ed94190edb2ac2055694bb927457f94eeadf0eff340b9f5fdba6fad5b1dc0b9617829ce3470914cbe0ba0be145dfb000218d57f22ee767ebb8082d6c06bfb
-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
+AUX docbook2X-0.8.8-drop-htmldir.patch 326 BLAKE2B dde7c28c224fc8c04b45adc2b70648a732ffec774c81c8497137026e09f842fb99329da746c1a1c1bd7bf9421b8f13db2d9b7e99d73c551d431f8b82b3f76bb4 SHA512 60e5d8a6cbb7c1e7360ad40678314e3a7825a73dd28967e6139ea097a0190128f23699ec4f18020ccb3bd0e4064600c9e94b7f0b49fdbcd98faa5cd978b5ec22
+AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1099 BLAKE2B 814d2102ea782d9098b2899e50b577b4bdd0e0d1b5df372db14ebb20ca022a259088213e64c22713382d0bf8042f4059e37b64289e5f19f713458778f1ef7486 SHA512 bcf507adafb7342d505354ea5134e3734dfd46e9853d597e2cb847b6853a8768c1317b47d9db9639cb95fb14526bb9bd4897e30a327c13cffc4e2a85eecfaa22
+AUX docbook2X-0.8.8-filename_whitespace_handling.patch 1702 BLAKE2B e72498323f32b6e8ba8d98bd1a3f5a614eedad4fb6d939f699ab7abf6d674ffab76b99f4ee218864c0f7b1351c6a62399dbb6606c466c4acbbd4b8300b655576 SHA512 38920a5f9dd142f7f76a5aa1ceb6a3c0e71dbb5c73b4f0408e249f5151a32898821f3e28c5f8250c2e2c29dd7453fde387a69890768d7d89f090f61a5db74b16
+AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3048 BLAKE2B 556e6c51091710087fb951430e83358978f00247629a7f5242e388e019f7ace467efbc7e6a1559642ceef6b7e941ed26c0bf00643ed8c81586998e215481a1a0 SHA512 9cbe0850aa255531b24cded169dc114f12cc40b34bb0d0be0d9461f413655633aaaa61267840d6b288d9090340d00631d717ab0d0f346e140dee16c92f1bc9e6
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1569 BLAKE2B 245ff0908e542aa8306c8dccf41bacd4739a4e65f2e62e199aae90822625209d904083760237dbb83292c5d07952bda91c2f8ce3744d4a2bda57cfab97cb1df3 SHA512 f9622a4b9dd9632774378c9aeeec9309832d3b053a7f02519d8d031fa8a195c8fa9f5fae5e3ac2bf1e9d2f2567792101cd7e390400532a21ab355c93dc21c41f
+EBUILD docbook2X-0.8.8-r4.ebuild 1468 BLAKE2B 28d165a69eccff74e7bdc8c4d949f771d31ed680c7741e9574546c312d76ae7498da0e73c022847c13494caa91cb87fbd5541f7da44abc59dd8317f4ffa320f9 SHA512 c4a77d087f1a9845ab54b32240fdd67c93f90a2ce4fdd0663c5a552f48be0c41948f6eba066a0217dce79c6de67b2db56d8334521f5dc0c055e1c8a83a1c143f
 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 53121b0e749e..bd850d269574 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1 #290284
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Tools to convert docbook to man and info"
 SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
@@ -35,23 +34,28 @@ PATCHES=(
 	# bug #296112
 	"${FILESDIR}/${P}-drop-htmldir.patch"
 )
+
 src_prepare() {
+	default
+
 	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed'
 
-	autotools-utils_src_prepare
+	# bug #290284
+	eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		--with-xslt-processor=libxslt
 		--program-transform-name='/^docbook2/s,$,.pl,'
 	)
-	autotools-utils_src_configure
+
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
 	dosym docbook2man.pl /usr/bin/docbook2x-man
 	dosym docbook2texi.pl /usr/bin/docbook2x-texi
 }
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
index a7e11b2dfd7e..a36308587e4c 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
@@ -1,8 +1,8 @@
 Put HTML documentation in proper directory.
 Patch by Chris Mayo, https://bugs.gentoo.org/show_bug.cgi?id=296112
 
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
 @@ -182,8 +182,6 @@
  # Install (automake)
  #
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
index b8a493be2f36..a9d598874f9c 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
@@ -10,9 +10,8 @@
 ## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
 
 @DPATCH@
-diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl
---- trunk~/xslt/man/docbook.xsl	2006-04-11 21:00:19.000000000 +0200
-+++ trunk/xslt/man/docbook.xsl	2008-02-05 03:31:48.000000000 +0100
+--- a/xslt/man/docbook.xsl
++++ b/xslt/man/docbook.xsl
 @@ -111,11 +111,15 @@
      <xsl:when test="child::refentry">
        <xsl:apply-templates />
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
index 26cdf8e1baea..7d181a1ccb01 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
@@ -13,9 +13,8 @@
 ## DP: refentrytitle and then replace any spaces left with underlines.
 
 @DPATCH@
-diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpage.xsl
---- docbook2x-0.8.8~/xslt/man/manpage.xsl	2006-04-20 15:45:55.000000000 +0200
-+++ docbook2x-0.8.8/xslt/man/manpage.xsl	2007-04-20 16:19:28.000000000 +0200
+--- a/xslt/man/manpage.xsl
++++ b/xslt/man/manpage.xsl
 @@ -30,7 +30,7 @@
  
  <xsl:template name="manpage-filename">
@@ -25,9 +24,8 @@ diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpa
  </xsl:template>
  
  
-diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl docbook2x-0.8.8/xslt/man/refentry.xsl
---- docbook2x-0.8.8~/xslt/man/refentry.xsl	2006-04-21 04:39:55.000000000 +0200
-+++ docbook2x-0.8.8/xslt/man/refentry.xsl	2007-04-20 16:21:53.000000000 +0200
+--- a/xslt/man/refentry.xsl
++++ b/xslt/man/refentry.xsl
 @@ -38,7 +38,11 @@
  <xsl:template name="refentry-filename">
    <xsl:param name="title" />
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
index b6ddbfa2a0d3..6c85701d2e91 100644
--- a/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
@@ -13,9 +13,8 @@
 ## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
 
 @DPATCH@
-diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
---- trunk~/perl/db2x_manxml.pl	2006-04-22 17:21:32.000000000 +0200
-+++ trunk/perl/db2x_manxml.pl	2007-11-24 01:27:37.000000000 +0100
+--- a/perl/db2x_manxml.pl
++++ b/perl/db2x_manxml.pl
 @@ -342,6 +342,25 @@
      $self->{line_start} = 1;
  }
@@ -67,9 +66,8 @@ diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
      
      # Define escapes for switching to and from monospace fonts (groff only)
      $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});
-diff -urNad trunk~/xslt/backend/db2x_manxml.xsl trunk/xslt/backend/db2x_manxml.xsl
---- trunk~/xslt/backend/db2x_manxml.xsl	2006-04-23 16:44:52.000000000 +0200
-+++ trunk/xslt/backend/db2x_manxml.xsl	2007-11-24 01:27:37.000000000 +0100
+--- a/xslt/backend/db2x_manxml.xsl
++++ b/xslt/backend/db2x_manxml.xsl
 @@ -528,7 +528,7 @@
        <exslt:document method="text" 
                        encoding="{$encoding}" 
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 7ae9b86bb3fb..01f4d72f10a1 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,6 +1,3 @@
-AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
-DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
 DIST dvipng-1.17.tar.gz 171049 BLAKE2B 7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a SHA512 b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7
-EBUILD dvipng-1.15-r1.ebuild 1285 BLAKE2B b1966083be571eb035c58ca968ae0e15ac1648cef37e7d60772cb8c0a4ae0cc52afa75e525580237ca7306d8b34d367ea5de1703d68142ce6a4bbc0927d7d3a0 SHA512 41491e753d5102ea718ce2d991ecb04b12aeb90ebf32aa9c848479105780f527763d4d580619246ea1b016d5bf965c03f7927fc4379ffbed47372ae44dc04625
-EBUILD dvipng-1.17.ebuild 1102 BLAKE2B 6065c23f7b8944d39293d24a0c52e28926390987421c776a39a83efa4c3729ac191f69775c17518a8fad0bec07fd5fb73c95f20bb0d2867b5faa7abdd50d6441 SHA512 7024d5302582be69b1823fde6c5c460fe932d5588b2a793e20577a464ceafea59be1c503f492eb9d448d13d0a65ba15c9482aa463820996c4713ebca4d9e0c70
+EBUILD dvipng-1.17.ebuild 1101 BLAKE2B b95fb6f2c3ef006b5477e3acf017829ed355f9ddd22e08206d6daf5d25a3e66f1e69a2cbfb8695b3d0865a49963d1c6971ede5236c7677422142343024089e5f SHA512 2392c88334ce53e3d73fce4e53f37b89435ef77c6b02f46237e893ecc25630b73c0a82b1e1ba32ab6734103eb95a2f1eeab3b44996740ffa0cfd73db7a6f0fd1
 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
deleted file mode 100644
index 00c92cd61184..000000000000
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Translate DVI files into PNG or GIF graphics"
-HOMEPAGE="http://dvipng.sourceforge.net/"
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="truetype test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/kpathsea-6.2.1:=
-	media-libs/gd:2=[jpeg,png]
-	media-libs/libpng:0=
-	virtual/latex-base
-	sys-libs/zlib
-	truetype? ( >=media-libs/freetype-2.1.5 )"
-DEPEND="${RDEPEND}
-	virtual/texi2dvi
-	virtual/pkgconfig
-	test? ( dev-texlive/texlive-fontsrecommended )"
-
-DOCS="ChangeLog README RELEASE"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-freetype-config.patch
-	eapply_user
-
-	# save local macros, since we regenerate aclocal.m4 below
-	mv aclocal.m4 acinclude.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	if ! use truetype; then
-		sed -i -e 's/\(--exists.*\)freetype2/\1dIsAbLe/' configure \
-			|| die "sed failed"
-	fi
-
-	export VARTEXFONTS="${T}/fonts"
-	econf
-}
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
index 80b7d38c3a40..068bb18ba2aa 100644
--- a/app-text/dvipng/dvipng-1.17.ebuild
+++ b/app-text/dvipng/dvipng-1.17.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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipng/files/dvipng-1.15-freetype-config.patch b/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
deleted file mode 100644
index 20b7ebaf465c..000000000000
--- a/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dvipng-1.15-orig/configure.ac
-+++ dvipng-1.15/configure.ac
-@@ -78,7 +78,8 @@
- AC_CHECK_HEADERS([libgen.h])
- PSFONTS_O=""
- AC_SUBST(PSFONTS_O)
--AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS"
-+PKG_CHECK_MODULES([FT2], [freetype2 >= 6.1.0],
-+	[CFLAGS="$FT2_CFLAGS $CFLAGS"
- 	LIBS="$FT2_LIBS $LIBS"
- 	PSFONTS_O="sfd.o ft.o enc.o fontmap.o tfm.o"
- 	AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2])
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 3f6c55b5cd24..b529b5d954be 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,5 +1,3 @@
-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 1248 BLAKE2B 87eedfdce26007b3a8e51514f3fe9ed39a22f5df35c2c8c4b7f15332701f18f1a316ab416203ba45843af3562f3aa3d8145b3b472db4e376e6085afcacf9b0d5 SHA512 1ad4412914e276774fe5e204db34e691a41b08d4f167df492a27aa2d0ba4df1ef08fcaab64722bc0b9e94a9cf0294cb58ee37d6af39a2d51df7088a5073eb30f
-EBUILD epspdf-0.6.3-r1.ebuild 1344 BLAKE2B 3107fc17f92c58007cbb85c24e9b9aa8cf79accb4b7d890b5fa68a557550c69093171c2446ac33129b57208f0b9b175ee504fce839ec19173446facfab6e4bfc SHA512 f2207054f038b8f1b13d4435722873f56636bf1cfd1d20016681a5dc745403ac374481cd7649dfd2c442afac168c1f7487da1161d165783f6908ad3c8a041519
+EBUILD epspdf-0.6.3-r1.ebuild 1343 BLAKE2B cd941f093434f753035f7718ee1f6704238d781ce4d0cc11ca21c1104933e2d3662dabd3d37cc3869819ca81abd1a1bf1d92b75e904b33300771dd4d66eaf08c SHA512 474de1a76ede7376fff767f5ccb2d019c95b2930b521af587239f0b5f98c4fa421f17f6d8309e301b3c2b4462338f27521b7ffd741179329ba5d9c3a54d6f78b
 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
deleted file mode 100644
index 3c672aec748f..000000000000
--- a/app-text/epspdf/epspdf-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop texlive-common
-
-DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
-HOMEPAGE="http://tex.aanhet.net/epspdf/"
-SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc tk"
-
-RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
-	>=dev-texlive/texlive-basic-2011
-	app-text/ghostscript-gpl
-	tk? ( dev-lang/tk )"
-
-S=${WORKDIR}/${PN}
-INSTALLDIR=/usr/share/${PN}
-FILES="epspdf.tlu"
-TKFILES="epspdf.help epspdf.ico epspdftk.tcl"
-
-src_install() {
-	dodir ${INSTALLDIR}
-	cp -p ${FILES} "${ED}/${INSTALLDIR}" || die
-	if use tk ; then
-		cp -p ${TKFILES} "${ED}/${INSTALLDIR}" || die
-	fi
-	dobin_texmf_scripts "${PN}/epspdf.tlu"
-	use tk && dobin_texmf_scripts "${PN}/epspdftk.tcl"
-
-	doinfo doc/epspdf.info
-	dodoc doc/Changelog
-	if use doc ; then
-		dodoc doc/epspdf.pdf
-		dodoc -r doc
-	fi
-
-	# give it a .desktop
-	if use tk; then
-		make_desktop_entry epspdftk epspdftk "${INSTALLDIR}/epspdf.ico" "Graphics;ImageProcessing"
-	fi
-}
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index d19bd91cc735..e71c82bf02d9 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 ~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 ~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 8b946afdcc34..c8c41a59dd7e 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.36.7.tar.xz 2580208 BLAKE2B 76ba6d206289f9981af24e5d82c9567c05984ad71efe83391aa1f8fdd94d31c284e600cf81eab9868e01f120f71cde1ae9b6ee6b7a4b1da47458d17b95b78d87 SHA512 dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910
+DIST evince-3.36.9.tar.xz 2429740 BLAKE2B 7154d473561955df9be545bbda520034e7de1556ea241dd30833ac014af2bb20fc3ef1d7fe6777cdcfab90553eb3f0562e1452df62c1c1eeb6b47b5bb64298bf SHA512 54f2dfc287fa627e1474c4bb23e6127bc5daa7044c2158805e5af487b7d65e776da9b86adbb83ec63fad3ce4c339f57483a3a2d7b95ad14de2dc76e29a29a8fb
 EBUILD evince-3.36.7.ebuild 3133 BLAKE2B d178be50e5460d9d834cbb0b940c19541570fc4b2de8439b06c44db95685ef7e66a95e88c8e42b30b05461586bfbec3188053a7a98fe781d4c514e7aca8cdd0d SHA512 74a824eddcd0caf3c5a87432535bdc779fe1f328baa10f6d3ad3483d4b8e38eaff561785e1920413ee8e4955b259c2755b17ae15b6e2ab0a077d779dd84b7740
+EBUILD evince-3.36.9.ebuild 3085 BLAKE2B 2a03f08a70a2601cf8d7bfec6407467e894c5e90abb44f95bf85c8153cdb08ab15035f4e092329cb381b18724002fcfcde179ce98fc28e9f7a9b5dd95a966998 SHA512 f47f5d5ce87b54ac71d319186b8de8092dad584d8035e98488e63ba62f8c18f9a566e46f777c8dd559a24f6f887340814d529927e3c4b87a94e7a4baeb7246da
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.36.9.ebuild b/app-text/evince/evince-3.36.9.ebuild
new file mode 100644
index 000000000000..55eb01fe8865
--- /dev/null
+++ b/app-text/evince/evince-3.36.9.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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
+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-3.28.0 )
+	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="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+BDEPEND="
+	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/groonga/Manifest b/app-text/groonga/Manifest
index 5cb622ac6994..9433ea61f9dc 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -2,6 +2,6 @@ AUX groonga.confd 259 BLAKE2B 440b084d0e41da1b81e27ffa1e42963ce22d83027841039d48
 AUX groonga.initd 715 BLAKE2B 0cf870704257490477a7a254a670ef5ce48141b8c9c4119446bcfab92972319857c77ebe41044c7d338b10bb720744788ce0313f8b2ee50277571513d0cfdb83 SHA512 7b4f789c9201f40fee0d99b94554bc33aebf024da02794143317215713cea3f2a9fda2e87d2a8bb864a7d0c8a2c44e824c65deecd4c95360423f7d3a4f04f8c2
 DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a0016837810c12813bb4f208bf9b114fc514a8887e4f756fb0ec27ad2c991eea026bf57391e9234e49ee084656d26c SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20
 DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1
-EBUILD groonga-6.1.2.ebuild 2413 BLAKE2B 0d9472484b1d0bfd0949c968e52f6b80737d5398d9304a35826984a30db9555610fc2e8512b8eeba6bd0fd33b9f337d70ceceb425ebe9180530fdcff75390327 SHA512 d6832fac842eab906b5c9df2cbc9e9158b1336c39775a42eea818e8e8fb3ea40917ad02b6b89517bf6a75e6477e92bc0cb290343fe5fb8bf685cff79c3c6fdbe
+EBUILD groonga-6.1.2.ebuild 2415 BLAKE2B e7e4765e5fecee4a93db394121c490bc86fed89eb3b52e17fdc474393f020f1a65eb8f7108289d2a8ff291d0f5cd96d5d0d1a9f8fda45b1bd7ec16fda39898e5 SHA512 55e1234b5465175f906dca409bcd47808250bbe87feada889ded367c0a768d2515b9178745b4f03c35052f06aeb6526e3a20b3e78e1cff3b581bf9d203ca0ea4
 EBUILD groonga-8.0.2.ebuild 2621 BLAKE2B efcfa60f6d05c88d765973434c2fa53f25d28de79ac627cd1d5ba7a3f7313e214c88ecff5b70f16b1fac046f7b8ad919311c6d5abef3ce762f413a0de4fe2627 SHA512 875ffc1cd44664637e860ffd5ac91ae1e5b8b6858ca6413fa0076090e04a0bf78fa89e03e3e8f52941adf1d8a748bdbd4d0c46a8aa3bcf6ec00914b219b03aea
 MISC metadata.xml 1156 BLAKE2B a6fdcf212e2de097ea99dee4c071da0af7c4024a9c4390aaee67a94f1940ff3483e08a5c20e301e47de63dffc59856a2114c2bf72de9f22e2031bd60c719fe6d SHA512 a1e8936921f6688690cc70ef39eee1abfcdb7b6940de9a29c6f1f3750c3dab4e8f50d1e189ee57ca87085e8e0daf81ff52a93cd81076745f6f479d291fabe079
diff --git a/app-text/groonga/groonga-6.1.2.ebuild b/app-text/groonga/groonga-6.1.2.ebuild
index 144873b934c1..f10e95ad95db 100644
--- a/app-text/groonga/groonga-6.1.2.ebuild
+++ b/app-text/groonga/groonga-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit eutils libtool ltprune user
 
 DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="http://groonga.org/"
-SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index d5b978fb3903..b15d87999c39 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,5 +1,5 @@
 AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-EBUILD highlight-3.57-r1.ebuild 2796 BLAKE2B 5f381d9e9fe5b6268e61c54e9abb5b67bf83d58caab1261f2c904d65ddda3455a5e0b453bb2c3a7a46461e28b2dc656c71c293064af1a15368d4205edc44faa4 SHA512 69646dd692daa9c7b458c489d77b8d372e7603b5a2809e3cdf49a55e5eb512e3f274054512da668f0dfdcb1c908dbc9a9da376f827259854dfb0d27f5b9ac7ee
-EBUILD highlight-3.57-r100.ebuild 2404 BLAKE2B 6fbfa8a99cb1f37104a3b865dba125bcf356240a6c55772ab7e69997fbc6a0ca57ca77238149ec3497b5fb194354f3787ff61622190eca6a03e93132a41b0092 SHA512 171cde8c66962d09b4be1f28c5409e680a535d3ec2b67dd12d0c99d90f9f04f4225b90ea97dd4788cf7fe4868ebdc4bcaedcef65ee8e10995d73b0e6b466e821
+EBUILD highlight-3.57-r1.ebuild 2797 BLAKE2B 58e774538015b0a194f6ecc7704b65f33ece3163f3e27d63aa32bdcfd12c3d4a2cce678f723f97e6d77ee73f6465f1e1bf1aff3e1f0ea77bf5e43cac5e03389b SHA512 4799a93b1588e7392f2953579f71ffdadb37e3d5caa8fee686dc2f204d1bdc1cda9c17219eff8c81482925ee2b2a3b0445f45c30cb951323af2b55cbbecb91fc
+EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 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 971c9675c1b5..f72d80ed7772 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/highlight/highlight-3.57-r100.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
index 7cfbb9f2be8b..30e6ae8553b7 100644
--- a/app-text/highlight/highlight-3.57-r100.ebuild
+++ b/app-text/highlight/highlight-3.57-r100.ebuild
@@ -13,7 +13,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"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 4d4946d42aa9..bf9bf05dbc33 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,3 +1,3 @@
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.6.0.ebuild 670 BLAKE2B cdd880755781fbddaba81f3ad15fbb9d3bf7a1f069c03e31de9d99db37b04de2178bdf16c14c789f301206deba7b07e06999c1536b1a9fe6e2252d54b5d0be7a SHA512 44023ec8d401b7ba2b2105ded5c31ae34468e68b1bf666a61d3f105939a6bd5ed08bdb9c1c430ebf53d51c8a985ed3a51ef2ad85d78eddbce4c93e3a1757c9a1
+EBUILD libgepub-0.6.0.ebuild 669 BLAKE2B 2eee9501484b5b4b1bd744bacef812746012f6b93adeab6975d8f3357e7c9eafd60e3669024bdd6b8cb3e6b9664675c215db8823abea07f141ba6cbbecfd8da0 SHA512 5d720999dcd5faaea8d8dacea17006a0ee627661f48bf7de00a2184d47f414f45730310c08ad6530296c94db011d66ecdb945a84d29d0487f2782717b4249fc5
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index f2b3935ddcb1..8410a7df7102 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 755a048c9a4f..60f82f91b5a5 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,5 @@
 DIST libnumbertext-1.0.6.tar.xz 283416 BLAKE2B d02a521db19a21c6036412f902af7227d7442ca25d38e5e35339f74c8ee6e275ed085aeb4c4f07f998bcdc33ac62be84ce6915dd430594dedad1fa0f65b388b6 SHA512 0b2a5226f363af9a6df90f788f6cdc5fe95ddb524d96ad2db1caf2e7f414649ce2975eae3c9e5fceecbf825a90c736a0717b02ec9671e980ab9cfb3e2df73b8d
+DIST libnumbertext-1.0.7.tar.xz 289764 BLAKE2B dc7a340dd1843ac77088fd31d4343b570bba0bd5758b939ad228d9d31a7f283ce9c11cf8a504e0c14464bfc6962911b7d1c075122d3efaa7014180a57d419248 SHA512 7755c713dd9b9b75e486eac7ffbfb418c3bdfefd67ecb149f0e25a339410814bf73296f69a4e009a17f9f21292f0eeafa931aef60596cd3d932dab47278de8c2
 EBUILD libnumbertext-1.0.6.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
+EBUILD libnumbertext-1.0.7.ebuild 547 BLAKE2B 01bcf67a2e05382f90add525bd38c16a416971e456654c0bd13bf25052c7db56b08c8f49213539d63027674c347b87940271cd528e5b9318bc32ab272c271a61 SHA512 124f3ce9fefb6248c8308ffab658a7827c510aa7a00b7dd3c5ab5e2804436cb39bb359085062d95d9b331c566ef64b11b0d354366c568288e261747c57eea97d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.7.ebuild b/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
new file mode 100644
index 000000000000..bb54e140daaa
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Number to number name and money text conversion libraries"
+HOMEPAGE="https://github.com/Numbertext/libnumbertext"
+SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 394517abe2d7..84fcf57f79b9 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 627 BLAKE2B ea3e3eb726a4728147ef1baf445e3e41977f58c029947488124371c688d6762d71aa2074cd7dafb0dee351c14b1ed8f898b841206c894a5b7890c4b3608b864f SHA512 125298c133a14f809e5cdf634c7db645c1da01736ef4c3cbaa4f39fde72df0b66a825796e5192898a9c78241c5cb2521e3b8c42aae17fe787f63b16ab715ba00
+EBUILD manpager-1.ebuild 707 BLAKE2B 5d0d6a974416bcb29226f26aa3dc45609f8ed7b17e42068b1f2fe0473b0eab3742968b572c257b3eb3d23e1c876a5e99324f185968cf4ce2ea97bfef9ad886f6 SHA512 04ea79f9bfbc444aa3958b46c28a94ce5e2f00d017fd2ccf80556e9c10641374a58ff27400628d9a07d8c66401ae4f88fbd140a359266e250d1ef5399f6a9d6d
 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 8d814266873f..7a79443f990d 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 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S=${WORKDIR}
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 3dade61968c0..86862d3985d2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -6,5 +6,5 @@ AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799
 AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.18.0-r2.ebuild 4122 BLAKE2B e8bf328f63f9b469a4e1a561ef97c029252fa69776ebbc0a4677ad6668757ee26c083842e78cac6807c86932b04437ed025b5e6a82b4492c6f898a04bf7dea3f SHA512 537ce8ff3f792ce0eca92f7a209d1984158b44f7ad214fa7d941a80ff19288b4ffce80e5a83508bff156aa287f100a8304c504d60a4831284fba7f46320520c3
+EBUILD mupdf-1.18.0-r2.ebuild 4163 BLAKE2B b22323a9ff00fce48d8f79816d55e18a89ae1f045a9278c26015ee2d045221b50baffae9090a13060f4d19e7756b03e093362190c9c34fe1e04f20bd80996b24 SHA512 3fc010afec1b390d7205d64ee2e9a6592dee800fcf12980e94558dff3f707d688c7a0ab55c42c5453e856ab928bb04d0b55127387526afdad978b68c224b6f9e
 MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/mupdf-1.18.0-r2.ebuild b/app-text/mupdf/mupdf-1.18.0-r2.ebuild
index 9f330cd3e030..92d5e21ca24e 100644
--- a/app-text/mupdf/mupdf-1.18.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit desktop flag-o-matic toolchain-funcs xdg
 
 DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 S="${WORKDIR}/${P}-source"
 
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index d070799e4a6f..3a7b441f568a 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -3,5 +3,5 @@ AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d
 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 1996 BLAKE2B bca31a777164cf72923d05914b2529b11b3b9dd44a2f484b7bfd57c6c5eacafc609aafceefb573e5a6240866c2dd33980c6c9b220e8c868145924088a6bd386c SHA512 b77c93d4e06f1437c0e8ed331b5ea7f8e6c6cbd6b22bd43859752ebf7212882edc2bd53e8097cb246281353066fcf334e5f0aa84e69f848c41f3542b9c4114fe
-EBUILD opensp-1.5.2-r6.ebuild 2072 BLAKE2B 5312a2e895bd5b7335373a2f4d13773957d8a6eed9af8779b585d0661837543a50d4181dfd6c26d663441a52a5712bbf9ac62fe38835b1fa5d53d23346dc7de8 SHA512 873173a1c9df1a947c5dd93b6524c8a425c8f919459e69c78aad0f8901328c7e39979271dc6ee3687167ae98ba06aa69f01887bfb5d48dfa146105623c75684b
+EBUILD opensp-1.5.2-r6.ebuild 2089 BLAKE2B 2de671b2e690a7058d9955181ce2229e230bb1f2af2dceec8f56eb227be6eefea6a56baa44fe06985fc0357cac0013ad6722172a37b3ba379f34adf271f29195 SHA512 e68b5888f0351cf4921187dbb8b7247785ba040f3096afebd03f2a12b7d9253fc30915dd4ee08fd183518883259862ac49baadb3c78b03c789f2cf217e9fa19b
 MISC metadata.xml 320 BLAKE2B b93835e4e002171464888c0ad80df13fa041436cd16525da0bac6087af3013b8c43bbcc2a12e6924894ea65ef141c6e739ca38f914af7e83910b85a4f6700547 SHA512 8614ddb85153854eee8f3a61e308a4590b17bd457f1dcc813fdad1f69265a06f4f74295a608538fcee757e147af9b269adf3d0dafc0e613a936e5e605bedacf4
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 7288276a5076..a3c57f7e1b2c 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_glibc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index d68cb9a87b2b..db960adca4a1 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,7 +1,5 @@
-DIST pdfarranger-1.3.1.tar.gz 120834 BLAKE2B 5f429d479d130ec06e795c6cedc2aefa75f89b971b556901fc0bfba02038e36c4fd7b4233b5ce6d0dfb6252862176dc7b07192ab43e458090970a25648bb946e SHA512 6ac13447410477e9125da26adbf7123f7f5ffa25814a4c254247a5ff2d07eba6af0557eafb60b4c68ac5987c8e9e7888da21296fb6a74d31a3d0d763b1077918
-DIST pdfarranger-1.5.3.tar.gz 221208 BLAKE2B 2669a3be00d771542ba2449696de74d633fe31c1ab84ff368ea95ffd6e6f6bdd4d5bbb2b0b2cf1c2ddcddcba9e774f1870ee3c85735f54c832894e2093392042 SHA512 17960786b2197e4035b2c224cbeb8e6d14ca7690920a4366d3dcad8b19f890b52d5e95277372fe3011f3476a5be0c4f253eb4d3ee3b6a8df74e20468be124d8b
 DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390
-EBUILD pdfarranger-1.3.1.ebuild 730 BLAKE2B ea73de82d730dab7cb9864fe4e3749cce489aae0e1a6552dec0ab1287f553b90323ddb341c522261ffb2d9d0727637c75136dc354922d0cf9ffca94e3d20c2e6 SHA512 22aa42ef5c814efd002f75de5c045c510f610d783c978df25a44ea4a53e203c17ed8a11adb42e7ebd8a7c00f4197682aeef0b0fad98082af9774c7b4bdb74b93
-EBUILD pdfarranger-1.5.3-r1.ebuild 1075 BLAKE2B 1bdc7c07c77a0226025c36ac205aef46eeb935cf065e9cd3044579b0c4ed235c01fbebca22f9d48310bf2c4502edffb53fad4bf44fa57508959fde0b6738ac09 SHA512 2098d1b380060c68632207c32f346a8e14cde2d96a46447af35aec3a3d3638b7c0b13ac3f99d17d3770399662b59b4822cc82b05d88f6a25d52cf7706fdbdc20
-EBUILD pdfarranger-1.6.2.ebuild 1211 BLAKE2B 493036de2cb2802329cc3c33144fcfc084e23c8c33ba0718f8ca714832b009f62d99e7591bf202a74ead4769a6fc0fb131255c4181bcb3dfa72a884a9f059ed1 SHA512 980edb6863241bbe83129d2916f7285fb14e793b5c28ac4a9531d68e92f1075b5a2d6fccf2d2e94e490b2695ea51333da2fece276ea2ba8e71d31db3e0f95480
+DIST pdfarranger-1.7.0.tar.gz 236125 BLAKE2B f16eb23fb597a22a48f075ee6435c74d51a4c45d35e03ec02b2b2353c29ad327f36f6af9ef028ddc53777ecae069e62437728308cda2a6296bd520c2a54e1220 SHA512 8f3c804119d5e4aa78cdae1964757be3404977a68dacccddea0e3e598c531a0ae163567709358ccd60764bebf3a55b5ed1bfbd2e0392c97569ffd9a18f549552
+EBUILD pdfarranger-1.6.2.ebuild 1210 BLAKE2B add4dbd20ef2ab4ae3adb5a897caf7518f1386d39f40e269091d1458e75c9dcb9e0fe7368930d93ab73d8addb83cca9cd35ecd3e0adbf3632b6c481df100a9ab SHA512 c339eee94ffd0f148929aadc8b8fe9cb8992de7d6fd63e5613357231bcae2f1b5b332ae07e0f6653e5392d9d2977a45c508c69422ea7adb88500cb1c57ce65c3
+EBUILD pdfarranger-1.7.0.ebuild 1211 BLAKE2B 493036de2cb2802329cc3c33144fcfc084e23c8c33ba0718f8ca714832b009f62d99e7591bf202a74ead4769a6fc0fb131255c4181bcb3dfa72a884a9f059ed1 SHA512 980edb6863241bbe83129d2916f7285fb14e793b5c28ac4a9531d68e92f1075b5a2d6fccf2d2e94e490b2695ea51333da2fece276ea2ba8e71d31db3e0f95480
 MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.3.1.ebuild b/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
deleted file mode 100644
index fd2ca31f7a2d..000000000000
--- a/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
-HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
-SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	app-text/poppler[introspection,cairo]"
-DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
diff --git a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
index f3d0a8fa4fe9..0e0d68ad79c3 100644
--- a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/pdfarranger/pdfarranger-1.5.3-r1.ebuild b/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
index bfefbb31a48d..f3d0a8fa4fe9 100644
--- a/app-text/pdfarranger/pdfarranger-1.5.3-r1.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
@@ -1,34 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 optfeature xdg-utils desktop
 
 DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
 HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
 SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
-RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+
+RDEPEND="
+	app-text/poppler[introspection,cairo]
+	dev-python/pikepdf[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
-	app-text/poppler[introspection,cairo]"
+"
 DEPEND="${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
 
 src_install() {
 	distutils-r1_src_install
-	insinto /usr/share/icons
-	doins -r data/icons/hicolor
+	for x in 16 32 48 256 scalable
+	do doicon -s ${x} data/icons/hicolor/${x}*/*
+	done
 }
 
 pkg_postinst() {
+	elog "Optional dependency:"
+	optfeature "image file import" media-gfx/img2pdf
+
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 9823c4db1f4d..d1b2c6b96c15 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,8 +1,8 @@
 DIST pelican-4.2.0.tar.gz 1332348 BLAKE2B 879a9d51f2b2956e895302dd613c877ff65bf8d420cd70144618ada07723037bca680f6983bdf3860d144ebae4eca8198219dad9caf0d6ecc06745a3881447fa SHA512 9c9f41306739acc4c6c6a7ddf50d955d958af7be1da197b42859b95405b18ab5b597fee4f9aabdf98cd508204558bff9c4f0c11bf4e5367b16e32568682a21e6
 DIST pelican-4.5.1.tar.gz 1397023 BLAKE2B f12b16045feaf001c8f6e57116fb8e807ce1d51f16bf7a373203edec3d1edb91a2386dbf8fb008efbc11654ae1cbe678b4a3cbf99349340db1d784962e81ab5b SHA512 cb27399d3c280981d1e8cd01dbfd54b1a8bd11d9b87c4717226a2a467d73c3ad4e038a8e544534289a73e9e3cc64b4414e2b3bbf2cdd05b917d02df79ab40b5a
 DIST pelican-4.5.3.tar.gz 1397896 BLAKE2B 86651f627af67c571ea65a7ddfe7b62747fd2798575d6c4f29455da9b2371ce22ff42d715f148925724764e0a9fbb8aeba1dea401226856d3681b520dbb0a7af SHA512 b1ef5f145b448f6af2e25a1adb399521d4c5f7eef3ee2aa5ab9e50c223623b5c9961622e5cd835a3cb72dbbe905da6ac9217128f2459a35892bbac9b9cb6d26a
-EBUILD pelican-4.2.0.ebuild 1474 BLAKE2B 5413d05853167e65f302d685032a3bf924e5e6d52affd6b6892787860db1271623c13a4bcc573790ad7e649dd805003701d23753b13a998b5f39d646f19732a5 SHA512 83b71f4f950b9d9ff972df4e1052e7eff0adc5c45abaf0a20ef4e2e602aff1e356dfbd09102b6430b82eaf7757b6f3c38de99f61f76bdf522f48dead43d12dfc
-EBUILD pelican-4.5.1.ebuild 1509 BLAKE2B 1fa7832f510478b0b30affd5470586957527de3288fac394435081bf13ce22218b2fe083dbe539f4222d674ce36cebc80dd622b651a86d8f2a2fb3ef00b5f837 SHA512 6cc7da9c8379ad7dd3319d1e9b4c419f928ee8c484e3238f155b8beaf14b4f478074f098b140fc5b2843e48fafba0fcf260156ef0856de8d8d66c49973d862da
+EBUILD pelican-4.2.0-r1.ebuild 1496 BLAKE2B 1904172079b4c088d526099ca9eaf16a4d32d84b757184f739cfd3c00bef3836f3fe1e0dc9aded8e72ec8750780163bb8579732b93cb5d33490eaf5b407de014 SHA512 1336584c84bea1eea7965438e7a363830c581bba3d2bc5e73bb2f8628808221c14e60ed24781264831d3d5843381e1fbe68b31e4d12dc549bcb1de39d421dd17
+EBUILD pelican-4.5.1-r1.ebuild 1531 BLAKE2B dd05b2da83c9c40b8615e566cea548ef331539fdbe36f058d5af7c0eac26bd5390132084faff0d7bd98ae3d2bd1ec5162babc0fa4a28853d6f28f1b429214e83 SHA512 f823ded1cd71ae0a5e3563886a7385f16a085dfc5e379d2fb74762d47ad3b6261b1b13b70c8e98d786b350a31eecedd66576d3279ccfc099118bbf363456d1bf
 EBUILD pelican-4.5.3.ebuild 1427 BLAKE2B 6ad0b6a55dd7c7f8c0773d3fc4145ad435238d70e7539c405b485564200b40e21e9de1a4d6b546811a744ffa66ed9fc5066c6e18d7377af237c8692f7a31c666 SHA512 d5e598875ab2b68150ecceda3cd0235b139b38d3cb4c638b53d12951b698603af6ede5156b55d3edce3737b712a8ef990b59c577a981ee9417a2cbe0ef10d500
 EBUILD pelican-9999.ebuild 1422 BLAKE2B c60d1e169af3170ef94baa62be09d7d089de05c7f282c7f69461530ad9335c894ae020d05a024667e6c16e86663924edeeff6df6b0bdb1bd668dbccdb0379e1f SHA512 bf0b1881f75b42c9db16b7b8604b8e0f2543d579b78033ddb0292cf2dd21fc64e7000211d2dfe127202f8231483035a7c1117e6eace2194150b026f299188269
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-4.2.0.ebuild b/app-text/pelican/pelican-4.2.0-r1.ebuild
index d7e224477c45..78bf8edfb8c3 100644
--- a/app-text/pelican/pelican-4.2.0.ebuild
+++ b/app-text/pelican/pelican-4.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,12 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc examples markdown test"
 
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)
+"
 DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
@@ -26,11 +32,8 @@ DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
+"
+RDEPEND="${DEPEND}"
 RESTRICT="test"
 
 DOCS=( README.rst )
diff --git a/app-text/pelican/pelican-4.5.1.ebuild b/app-text/pelican/pelican-4.5.1-r1.ebuild
index 5f35be70237f..b43b78f34e59 100644
--- a/app-text/pelican/pelican-4.5.1.ebuild
+++ b/app-text/pelican/pelican-4.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples markdown test"
 
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)
+"
 DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
@@ -27,11 +33,8 @@ DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
+"
+RDEPEND="${DEPEND}"
 RESTRICT="test"
 
 DOCS=( README.rst )
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index d7a7670efb03..526ae5e001cf 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -6,5 +6,5 @@ DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e
 EBUILD po4a-0.57.ebuild 1285 BLAKE2B bcf6b815289c5ee26d89fa62cdc838214c55c96c389fd3c702b8805250154662f857035f830254ee845e940e247ee5233703045b08746cef04d935643f93021a SHA512 0708efd6af416b9041c046a4d4ef6ac3548f31c971a818813e72b2eba1e19a68ca1b898557f1c9984f514efd8855bc0c807a8528fef90bcbf627cfa8580b956f
 EBUILD po4a-0.61-r1.ebuild 1351 BLAKE2B 6debc9afb688b43cb32ceb5f7917725bdc3789b5a85608f9bb04b7ad0c068736d9aa017e833736975391822238a7da423693b47e9dedaead57e411d3163b5920 SHA512 bfc6365370153ef887cd12c35b54bf266cfa058f10e897394cdbc39e663ee059b17414c9dcd758ad8efed8efd2de36c49f1edd5e4d19887227af41161752adb9
 EBUILD po4a-0.61.ebuild 1326 BLAKE2B f588b1f4753b7e4d59c1c5b5eaa74a13773392ceeb3859663472b52ef131011e419884a1d49f6bd9f611a04243140b642885df8fa0a858666670f86c70a7a4cb SHA512 8be8325f4e2cf06e0a4b039a23e2ed14d54ec7e2d2668f58eafffd4bbdfad02b60d86c8d2be0a24a34884b348768688041c3a2da0929eab68b72d2763bcfc428
-EBUILD po4a-0.62.ebuild 1351 BLAKE2B 6debc9afb688b43cb32ceb5f7917725bdc3789b5a85608f9bb04b7ad0c068736d9aa017e833736975391822238a7da423693b47e9dedaead57e411d3163b5920 SHA512 bfc6365370153ef887cd12c35b54bf266cfa058f10e897394cdbc39e663ee059b17414c9dcd758ad8efed8efd2de36c49f1edd5e4d19887227af41161752adb9
+EBUILD po4a-0.62.ebuild 1383 BLAKE2B 2d2f86a2cc71b5f7bd679c846c4c984492662e67a35a609de6527e453bf474e29706cf745fa868be1f10852a5a8b9b1c32d99eb033af82d848eb54b23163e52a SHA512 20b8cc64181a81b51946a3544d690b68360ede8a31632c53fe668a2a0118f2027ff01291da1dac8e90df466894cb67c575f876fdb9e6b784a324b16df2408ec6
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
index 2732597fc5fa..3cd43355adfe 100644
--- a/app-text/po4a/po4a-0.62.ebuild
+++ b/app-text/po4a/po4a-0.62.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9f6497fac332..9ec838ea7e6b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,10 +6,10 @@ AUX poppler-20.11.0-respect-cflags.patch 2797 BLAKE2B 8c37ed086fa823eac8d04e47c0
 AUX poppler-20.12.0-respect-cflags.patch 5494 BLAKE2B 8107bd3cb374694aea1dbd66cb95258ec568bea0bd00ff02ce9cd074e23dd8f399543d2055578654cdf7db09b46bd051346a596538305af883f9eb45c0916e47 SHA512 700233376a3254e3e5667719f95d00f828850476e3156856068c8b7faeff8c438c494606aa39f5551e998e02dd58aaca63eaaa5faff606f75d9a272631bdbc8a
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
-DIST poppler-20.12.1.tar.xz 1660164 BLAKE2B b96198be824dad6bde3ed89cbd05ebae001914c253d1b95321088ee209c73134efbb7f0044aa5d20c07d35b2460f5d17171810f36b873d2542e4bc93f423273f SHA512 a7ede8b11ce73c724fc54bc1e522ecfedaff65a08265c5faee4645765f1d6670a35abf67e57bdebacfd01b2071f1c532a04b9e302939a500fea9185f6e8226d0
 DIST poppler-21.01.0.tar.xz 1680536 BLAKE2B 5f8d283cd26f4713c09b0c102dd3295bc7ae1c2ad2ba0f51d12fdaed5f89a864d98d10be7176e17c5613aa4579da3bea1aca56aff3cec4e5c53e977a1e84659f SHA512 aec130446df73a2fc66851a563a14cb40299212a2de4a0d03668b0fecb28312fffa70d0a82431c774d0c0e3f7293788bd2bdf28c8136aa09ad80edbca4cf0ddd
+DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
 EBUILD poppler-20.11.0.ebuild 3364 BLAKE2B 0bed70002e75a2ef80c1504057f77c6fc89b0729d219352d534f6cec73a117d718364773520ed5fddc6e9f339e275a9ac2278e1755b01d6099fa8bd27fdb8d0d SHA512 674e487dee7bd6cb117de9c4eac0e0c7602e397b0c20224a90edd848ba373364d6d270f51fbbd49ada7528b26675e41179ed03cc6e608abc070e4aaeaa9252b1
-EBUILD poppler-20.12.1.ebuild 3256 BLAKE2B d4d15f8c5326f93b4cb981e6c55c8ee16ceff579d8ef2179a50efcc64a0fe1324e2093f096c6cfbd1f006fb5b3f554bb276f47a1366592e6f30d03475450b6d1 SHA512 44c3d7707917b40b52a681a2772a444fcf9ca0eefb8ce56f76b1b8bfadfccee29bd4ef9674d01dadc24886a84163d8f913978ef6cd5b73e51f8c08024da6df82
 EBUILD poppler-21.01.0.ebuild 3256 BLAKE2B fb1e49a39eb0b6fb4971b909c7f1f9bb5b4ff1f0c141c7cf141d6ba84306a4cf259cba1f4edc109cb8f3e649147004de0940ff9cf7808ac3f80a4d0ec2012eae SHA512 75de0d830cc06808e20d9355d3a551302602ef056c1e9ccdebad7874d500cc31488f76455296dad85100dc158c9b5689c09c5f361bcc19506bc57fbd456ec8f3
-EBUILD poppler-9999.ebuild 3256 BLAKE2B fb1e49a39eb0b6fb4971b909c7f1f9bb5b4ff1f0c141c7cf141d6ba84306a4cf259cba1f4edc109cb8f3e649147004de0940ff9cf7808ac3f80a4d0ec2012eae SHA512 75de0d830cc06808e20d9355d3a551302602ef056c1e9ccdebad7874d500cc31488f76455296dad85100dc158c9b5689c09c5f361bcc19506bc57fbd456ec8f3
+EBUILD poppler-21.02.0.ebuild 3256 BLAKE2B ef04f78cddc929747c2060e4c2fe0e1fe8ae6fc427af0c4fadde96d8bb6e30a7b6b761eccab339aa13ff185ebca2b8c15cb3a7ffce22086babd37e0a1ada7a01 SHA512 f0d74a22a12dadfb27c0b74060494fa753937134ce510e83cb8081de9199dfb98d5620d6d1f8fea755a589d112b940cafd9b7c206a9073b0e9ac72673bf54489
+EBUILD poppler-9999.ebuild 3256 BLAKE2B ef04f78cddc929747c2060e4c2fe0e1fe8ae6fc427af0c4fadde96d8bb6e30a7b6b761eccab339aa13ff185ebca2b8c15cb3a7ffce22086babd37e0a1ada7a01 SHA512 f0d74a22a12dadfb27c0b74060494fa753937134ce510e83cb8081de9199dfb98d5620d6d1f8fea755a589d112b940cafd9b7c206a9073b0e9ac72673bf54489
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-20.12.1.ebuild b/app-text/poppler/poppler-21.02.0.ebuild
index d9ca76490186..e6d3d0fbfba5 100644
--- a/app-text/poppler/poppler-20.12.1.ebuild
+++ b/app-text/poppler/poppler-21.02.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/105"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/107"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 0c0be114df56..e6d3d0fbfba5 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/106"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/107"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 1eb098b8ee5a..8276864b5787 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,5 +1,5 @@
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
 EBUILD qpdf-10.0.4.ebuild 1304 BLAKE2B f646282ac712a633e11ccbac8843da606371c91285e6f92df82febaf1161b90f0a19a62afcc00d3396e09078a3272cb666d3fb5f766be0260d8c4ee4ddd4b320 SHA512 e692d7326d710d7508e29348966323e43c802d5e9d9abe7062553f565b43bf565fa5069952420eb0b509570bb4b2106d34c65011767f3385abc8e8f0869192ed
-EBUILD qpdf-10.1.0.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
+EBUILD qpdf-10.1.0.ebuild 1311 BLAKE2B ac435cf51da6b724772275ebbe5a3e0421db00b51c9a59741cecdfe40fee0417f10c3b97b55f4fc69a014a68456c5e37cf2eba7e7bfb83ada8b2643f176ca13d SHA512 a3468bda0dac4a01c1c5cef2efad79c4101fc4160022c8cc1a5c14dd5af6c144719369251ef2b38ddb9d9535989996c435ebaebfba1b204b92522f529b67186f
 MISC metadata.xml 394 BLAKE2B 9f082b9d232876cce300488a5e4edd5ac46390af0a5cd21639093571b95ffde9771d74eb1ae664522796f6250c6e9c49e23f5e37e9819454dcd5b99ec97ba798 SHA512 b194bf416b11f76e04f300e0d3b6748302c9cfbda1f949f6caf9da07f297c26edbb65ada5edad820fa16c9fd971ebdc8202ad4f273ae5de3d01136f2cd95f6af
diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
index fa194fe13674..e00fc9a0d07f 100644
--- a/app-text/qpdf/qpdf-10.1.0.ebuild
+++ b/app-text/qpdf/qpdf-10.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 77ef45b7c4ec..5105b1a5b82a 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -1,5 +1,5 @@
 DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode-3.7.8.tar.gz 2230154 BLAKE2B 853a53d86a3a3600e5d70a8dc67bab9b0fa7a9dfab79e3f4ae8611f54c955802862689077774f7b21ce360f2d91c65ee238406ffa137a84545157e3a70853f42 SHA512 e6cd9c7d3eb5c179d3f62804018d1d19b71a3fae72b0d76aec730c36e64c50a571cbfda5340ac50244a16ccdd9265f5610deadb8908067c3866fa68cbbf0ac70
 EBUILD recode-3.7.6-r1.ebuild 1006 BLAKE2B 23141789d5bbcc6beabe28c9d45b29f9f0c984c5d8145351dff53cf73cf97192b6c022d74b864a5265d1b90eccf28e0dfdda7aea0d28ffeaf7923bce8655207b SHA512 4d598eacabba0db13ceee3101e738855f8f7bf5560dcfeb18f9bd11433c65c053cc2f79c36a63025297b6fa7309a23962d9340eb6bdeb7bcdcf1c80cc42bbcef
-EBUILD recode-3.7.8.ebuild 1306 BLAKE2B aed00a09f17165e8a0f5d491c3166a718a50fe8a6d7040716c809e46dc6c6ecb819c31d986aa1178d0e1b1be863c96d2712c84c017a6ad6e942b8ccbc7e676fb SHA512 b2eea5e29f2da46efc389b8b49c584144c40af5a40bc24ca0ce7b3879ce15db1953a1c79d5d33a90d0fc865bcf779082a89d8e174246dfbb2e1db43ee6628890
+EBUILD recode-3.7.8.ebuild 1301 BLAKE2B 71139bbc57023317a252b7d1cdb6cca309508c8b83e291cdcf4200635f9b70cceac9f78e7384bbd602c9979577d7331c5864e923b756e493ffd73b19410f1a2e SHA512 eba2ed15223676d58dfcf4580db85eb0e0b9d23eb018a14733b2f5af77706d752d8ee4a1555b701a4f7c300bf200832ec123bcf2a10092420152a6fc8cd77f75
 MISC metadata.xml 430 BLAKE2B 2df5bd5e46e37f7e60a6064a2f13876bc190121189057c703d98354a24de68e49b3a67337bb10a43c419b777af014fc0238940b44ef812862da5eb2250a06a5e SHA512 796421baea5a32814112194ac554251426312280ecd1517076a1b73b4e21026cb149e294df50a00e0c4674066640d0f5fc9f650198cde5b1a44f8f1446715d3f
diff --git a/app-text/recode/recode-3.7.8.ebuild b/app-text/recode/recode-3.7.8.ebuild
index 163176ef093c..f87d3f94bfe3 100644
--- a/app-text/recode/recode-3.7.8.ebuild
+++ b/app-text/recode/recode-3.7.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 # librecode soname version
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~x86-solaris"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index 74ad11177929..75f03135847e 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,6 +1,6 @@
 AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
 DIST teckit-2.5.10.tar.gz 2112617 BLAKE2B fe38bbecfeec61f2c926fc033230a753ce1435fdf77bebe3c6d6c427a46bd5019d23605ee3d73f733d6345301a26ad3b1fd207daa46fdf66a7728be4569758aa SHA512 c2d3bcf1245723bb3bbe9c147fc3024e667ab4d1280aa0f8b5394b2dd9bb75e3f2bf42f057744fa86ed551ebf3e0f13300072a0325888cb8f9501d874c356f34
 DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
-EBUILD teckit-2.5.10.ebuild 1042 BLAKE2B 6631e857edeb2de8e95fd9aac560adbc75460f42fb8b43e6927e38a1dda2523f5cba292c57ed355048b92c076dafc2a27337c41ec56744c5ccc90b26f6bb8db2 SHA512 10bc8ad67e0547961179a386c570208e5f0cab284fb2641c925c823a6711cf8cc2534fc8cdac81cb06fc3bf5f082fc8ffea991e5f7efee59d3f320db2ff1223f
+EBUILD teckit-2.5.10.ebuild 1036 BLAKE2B 11c20a6adf34511ed79344330a6b613d4ef6d81daf67eccf82ab12ab2e795ca4a89c0a5f2463a0a9d77921ed2c43446a5552d98405fcea3ceeb1c95c8f6ce53d SHA512 2ada9bb0c4d45e807608a27388a68caf9c62791ce1cc7d71052ac9285956ed107ddea9649ca7d585fe963d721a59b485aad9f8576ab6314b475811f31d569adf
 EBUILD teckit-2.5.6.ebuild 1098 BLAKE2B 9436882972ea3e20da426aae4bb5c68864bb339287cc71fd78f53ea1bc1b04b6ef7dbcfb067adbf96cf494efb0d82b852e66062449feed67f52d2873e072eaec SHA512 bad1481c8080d3639edaddea4d698d4fd45138e8aea40c21ce51fe86799f21e610460bc749cdbaba6376031a3a5b2ee3ba5672525507fa4f689ba28024545da2
 MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/teckit-2.5.10.ebuild b/app-text/teckit/teckit-2.5.10.ebuild
index 17421130f81a..45e26dfe81cc 100644
--- a/app-text/teckit/teckit-2.5.10.ebuild
+++ b/app-text/teckit/teckit-2.5.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index fb1b371e4ba6..b6cb97548295 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,3 +1,3 @@
 DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e9068623cae7a3ac853aa6fc4b5bda1db8969fbf2798b84daf84a46ad29e9bf9945cf62b51b90592300e255a3e2b SHA512 550b1d30a4435f35d03920d89f5f2adc2a937de7575c4ddc51ee9f4fe370975b45e51f5aec0eb865ead4b16d88ad31f3150cd3235362b1fc7e6d7b3c6233852a
 EBUILD txt2man-1.7.1.ebuild 597 BLAKE2B f67ac10cd49997f1e147d3e8392f7b704c214ed1e05964096a1b00460bbb7bdaa6edc5efc72c75d720a403837452e9d548588c1fa520d0c6edbf689c847f63be SHA512 b43ee581c855f367f507d26091da6746abf925869f6e5c9dd26d62b42ffc7fc78ba237ee888fb98b7620cd7656a8202e86e9601190fc6d740226cf089e8383e2
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 247 BLAKE2B 26b043cc5acde8a950c807d90f040a52d672f61066252046bb94442db3782370362fa847dd10db46aa43cd8eaf6d98fdcae1cd96cbd88503837b552d617a8fbc SHA512 7fa487183cfcb67ad70e1fd13ae062b8f4599aff3271714d10898feaaf9e1b1e1ed0d6905d1a801a470a98a9e17f3cf937803afcae74f201d1a1ecab5baa5f67
diff --git a/app-text/txt2man/metadata.xml b/app-text/txt2man/metadata.xml
index 7a38bb900964..6327aa553244 100644
--- a/app-text/txt2man/metadata.xml
+++ b/app-text/txt2man/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">mvertes/txt2man</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 1332622364d9..350098032456 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 940 BLAKE2B fb6b9231426bd38188a6fd3c7e18ad6b1d7af6dd4af2964ec278d81717f99c9f8366e21a6d505edf9ddd398fdb578d20c817c7f4cb6572612c7580781c1f0035 SHA512 891edcde0d98e75bd4eef3fbe640d40f68e772579a1d07c1241d39ab599f6704ea8987e1e02689d0fae8d709b3cb31d7f56991fb708a2ae619457ec0205688b3
+EBUILD xmlstarlet-1.6.1.ebuild 1446 BLAKE2B f9a6499dccb3edcba02665bdc94f2c06b0b3ebb9c65489efa31fef03e70f2954869eaab555532527c184523d15bcbe43bb17a46749c0e0465cc3087bf820c5aa SHA512 16ff0d0dbabc518687cee24decdaab3546c0c595373aaefdc4d618c75a27185183374211ba086037848da2b71df641789a56b8ee35e73a26bc2d4569f5223904
 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 c2ad4628c946..0ff17e1a8107 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
 HOMEPAGE="http://xmlstar.sourceforge.net/"
@@ -21,6 +21,20 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	default
+
+	# We need to patch use of /usr/lib because it is a problem with
+	# linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
+	# The grep sandwich acts as a regression test so that a future
+	# version bump cannot break patching without noticing.
+	grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
+	sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
+	grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
+
+	eautoreconf
+}
+
 src_configure() {
 	append-cppflags $($(tc-getPKG_CONFIG) --cflags libxml-2.0)
 
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index eaeffb7b0ad2..a348c8f51d45 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -17,5 +17,5 @@ DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
 EBUILD xpdf-4.02-r4.ebuild 3649 BLAKE2B 575cdd3db727f7efbe4f6146c5edafcbe763616e480cf28a7a078347e74d6570f817d5fe9db31a770b3dd014c370fa362521d0608e26a94d11b0bd49be8ea02c SHA512 c8b8a71667e9e42c401f74e9b609f867eff1eb0adc629b8ebc9726de389f17873ebdd321a1c0f694b366476deb41e4c907e383668655c490591892ada33ca428
-EBUILD xpdf-4.03.ebuild 3639 BLAKE2B f4be8a0d7c53315a9cd31e08f02eb7fcb740e376011e849daf4c94bf8be84b73c4fab14f3b91c88d29ce2eb47ca82028bea629a5356bc3aa109db77e4ed43cf1 SHA512 2979c5933346a88baa59cc78cc96111c48f8e9290d1ef5be792b2e2b4f73bfbd6eed678ab0bc6d3bbc8f566516254f541a2f116fe3265a14fd42aed841f20f7b
+EBUILD xpdf-4.03.ebuild 3637 BLAKE2B c2ff73425db4cd26b2b8b4cc655a074341384e11ff2784a390ef6a4e7e4b38c09f8c5db72c84f60978edca8cf7ea3196230ff77d4a9747ac5db71ae9ff2c738a SHA512 36c8c9ddadca31aa673135c9cf361d9889a2e81a00b3377c5150982919b05dac439cca40d23a9f898bb0317dc5ecb69153abf7330dead28f3cd867734a8f204f
 MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568
diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
index 486c4bc16290..c9761c8e26b8 100644
--- a/app-text/xpdf/xpdf-4.03.ebuild
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
 
 LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
 
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
commit	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree	c44943ee0563a3fa957716de909fed683117fcb9 /app-text
parent	69051588e2f955485fe5d45d45e616bc60a2de57 (diff)